Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit eca1ad82bda0293339e1f8439dc9c8dba25ff088

Authored by Al Viro
Committed by Jeff Garzik
1 parent 05bd831fcd
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

misc drivers/net annotations 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

Showing 6 changed files with 20 additions and 19 deletions Side-by-side Diff

drivers/net/8139too.c
Diff comments   View file @ eca1ad8
... ... @@ -966,8 +966,8 @@
966 966  
967 967 addr_len = read_eeprom (ioaddr, 0, 8) == 0x8129 ? 8 : 6;
968 968 for (i = 0; i < 3; i++)
969   - ((u16 *) (dev->dev_addr))[i] =
970   - le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));
  969 + ((__le16 *) (dev->dev_addr))[i] =
  970 + cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len));
971 971 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
972 972  
973 973 /* The Rtl8139-specific entries in the device structure. */
... ... @@ -1373,8 +1373,8 @@
1373 1373 /* unlock Config[01234] and BMCR register writes */
1374 1374 RTL_W8_F (Cfg9346, Cfg9346_Unlock);
1375 1375 /* Restore our idea of the MAC address. */
1376   - RTL_W32_F (MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0)));
1377   - RTL_W32_F (MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4)));
  1376 + RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
  1377 + RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));
1378 1378  
1379 1379 /* Must enable Tx/Rx before setting transfer thresholds! */
1380 1380 RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
... ... @@ -1945,7 +1945,7 @@
1945 1945 rmb();
1946 1946  
1947 1947 /* read size+status of next frame from DMA ring buffer */
1948   - rx_status = le32_to_cpu (*(u32 *) (rx_ring + ring_offset));
  1948 + rx_status = le32_to_cpu (*(__le32 *) (rx_ring + ring_offset));
1949 1949 rx_size = rx_status >> 16;
1950 1950 pkt_size = rx_size - 4;
1951 1951  
... ... @@ -378,8 +378,8 @@
378 378 sa_offset = 15;
379 379  
380 380 for (i = 0; i < 3; i++)
381   - ((u16 *)dev->dev_addr)[i] =
382   - be16_to_cpu(eeprom_op(ioaddr, EE_READ(sa_offset + i)));
  381 + ((__be16 *)dev->dev_addr)[i] =
  382 + cpu_to_be16(eeprom_op(ioaddr, EE_READ(sa_offset + i)));
383 383  
384 384 write_reg(ioaddr, CMR2, CMR2_NULL);
385 385 }
... ... @@ -971,7 +971,8 @@
971 971 int alloc_size; /* total buffer size needed */
972 972 char *top_v, *curr_v; /* virtual addrs into memory block */
973 973 dma_addr_t top_p, curr_p; /* physical addrs into memory block */
974   - u32 data, le32; /* host data register value */
  974 + u32 data; /* host data register value */
  975 + __le32 le32;
975 976 char *board_name = NULL;
976 977  
977 978 DBG_printk("In dfx_driver_init...\n");
drivers/net/natsemi.c
Diff comments   View file @ eca1ad8
... ... @@ -511,10 +511,10 @@
511 511 /* Note that using only 32 bit fields simplifies conversion to big-endian
512 512 architectures. */
513 513 struct netdev_desc {
514   - u32 next_desc;
515   - s32 cmd_status;
516   - u32 addr;
517   - u32 software_use;
  514 + __le32 next_desc;
  515 + __le32 cmd_status;
  516 + __le32 addr;
  517 + __le32 software_use;
518 518 };
519 519  
520 520 /* Bits in network_desc.status */
... ... @@ -2018,7 +2018,7 @@
2018 2018 /* Free all the skbuffs in the Rx queue. */
2019 2019 for (i = 0; i < RX_RING_SIZE; i++) {
2020 2020 np->rx_ring[i].cmd_status = 0;
2021   - np->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */
  2021 + np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
2022 2022 if (np->rx_skbuff[i]) {
2023 2023 pci_unmap_single(np->pci_dev,
2024 2024 np->rx_dma[i], buflen,
drivers/net/usb/dm9601.c
Diff comments   View file @ eca1ad8
... ... @@ -155,7 +155,7 @@
155 155 dm_write_async_helper(dev, reg, value, 0, NULL);
156 156 }
157 157  
158   -static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, u16 *value)
  158 +static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value)
159 159 {
160 160 int ret, i;
161 161  
... ... @@ -194,7 +194,7 @@
194 194 return ret;
195 195 }
196 196  
197   -static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, u16 value)
  197 +static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 value)
198 198 {
199 199 int ret, i;
200 200  
... ... @@ -249,7 +249,7 @@
249 249 struct ethtool_eeprom *eeprom, u8 * data)
250 250 {
251 251 struct usbnet *dev = netdev_priv(net);
252   - u16 *ebuf = (u16 *) data;
  252 + __le16 *ebuf = (__le16 *) data;
253 253 int i;
254 254  
255 255 /* access is 16bit */
... ... @@ -268,7 +268,7 @@
268 268 {
269 269 struct usbnet *dev = netdev_priv(netdev);
270 270  
271   - u16 res;
  271 + __le16 res;
272 272  
273 273 if (phy_id) {
274 274 devdbg(dev, "Only internal phy supported");
... ... @@ -288,7 +288,7 @@
288 288 int val)
289 289 {
290 290 struct usbnet *dev = netdev_priv(netdev);
291   - u16 res = cpu_to_le16(val);
  291 + __le16 res = cpu_to_le16(val);
292 292  
293 293 if (phy_id) {
294 294 devdbg(dev, "Only internal phy supported");
drivers/net/usb/rndis_host.c
Diff comments   View file @ eca1ad8
... ... @@ -218,7 +218,7 @@
218 218 * ActiveSync 4.1 Windows driver.
219 219 */
220 220 static int rndis_query(struct usbnet *dev, struct usb_interface *intf,
221   - void *buf, u32 oid, u32 in_len,
  221 + void *buf, __le32 oid, u32 in_len,
222 222 void **reply, int *reply_len)
223 223 {
224 224 int retval;