diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-02 14:10:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:18:23 -0400 |
commit | ba2d3587912f82d1ab4367975b1df460db60fb1e (patch) | |
tree | 1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/wireless/p54 | |
parent | 1273d97674a1782ff55b823aa6c40aea9b538aaf (diff) |
drivers/net: use __packed annotation
cleanup patch.
Use new __packed annotation in drivers/net/
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r-- | drivers/net/wireless/p54/net2280.h | 16 | ||||
-rw-r--r-- | drivers/net/wireless/p54/p54pci.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/p54/p54spi.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/p54/p54usb.h | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/wireless/p54/net2280.h b/drivers/net/wireless/p54/net2280.h index 4915d9d54203..e3ed893b5aaf 100644 --- a/drivers/net/wireless/p54/net2280.h +++ b/drivers/net/wireless/p54/net2280.h | |||
@@ -232,7 +232,7 @@ struct net2280_regs { | |||
232 | #define GPIO2_INTERRUPT 2 | 232 | #define GPIO2_INTERRUPT 2 |
233 | #define GPIO1_INTERRUPT 1 | 233 | #define GPIO1_INTERRUPT 1 |
234 | #define GPIO0_INTERRUPT 0 | 234 | #define GPIO0_INTERRUPT 0 |
235 | } __attribute__ ((packed)); | 235 | } __packed; |
236 | 236 | ||
237 | /* usb control, BAR0 + 0x0080 */ | 237 | /* usb control, BAR0 + 0x0080 */ |
238 | struct net2280_usb_regs { | 238 | struct net2280_usb_regs { |
@@ -296,7 +296,7 @@ struct net2280_usb_regs { | |||
296 | #define FORCE_IMMEDIATE 7 | 296 | #define FORCE_IMMEDIATE 7 |
297 | #define OUR_USB_ADDRESS 0 | 297 | #define OUR_USB_ADDRESS 0 |
298 | __le32 ourconfig; | 298 | __le32 ourconfig; |
299 | } __attribute__ ((packed)); | 299 | } __packed; |
300 | 300 | ||
301 | /* pci control, BAR0 + 0x0100 */ | 301 | /* pci control, BAR0 + 0x0100 */ |
302 | struct net2280_pci_regs { | 302 | struct net2280_pci_regs { |
@@ -323,7 +323,7 @@ struct net2280_pci_regs { | |||
323 | #define PCI_ARBITER_CLEAR 2 | 323 | #define PCI_ARBITER_CLEAR 2 |
324 | #define PCI_EXTERNAL_ARBITER 1 | 324 | #define PCI_EXTERNAL_ARBITER 1 |
325 | #define PCI_HOST_MODE 0 | 325 | #define PCI_HOST_MODE 0 |
326 | } __attribute__ ((packed)); | 326 | } __packed; |
327 | 327 | ||
328 | /* dma control, BAR0 + 0x0180 ... array of four structs like this, | 328 | /* dma control, BAR0 + 0x0180 ... array of four structs like this, |
329 | * for channels 0..3. see also struct net2280_dma: descriptor | 329 | * for channels 0..3. see also struct net2280_dma: descriptor |
@@ -364,7 +364,7 @@ struct net2280_dma_regs { /* [11.7] */ | |||
364 | __le32 dmaaddr; | 364 | __le32 dmaaddr; |
365 | __le32 dmadesc; | 365 | __le32 dmadesc; |
366 | u32 _unused1; | 366 | u32 _unused1; |
367 | } __attribute__ ((packed)); | 367 | } __packed; |
368 | 368 | ||
369 | /* dedicated endpoint registers, BAR0 + 0x0200 */ | 369 | /* dedicated endpoint registers, BAR0 + 0x0200 */ |
370 | 370 | ||
@@ -374,7 +374,7 @@ struct net2280_dep_regs { /* [11.8] */ | |||
374 | /* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */ | 374 | /* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */ |
375 | __le32 dep_rsp; | 375 | __le32 dep_rsp; |
376 | u32 _unused[2]; | 376 | u32 _unused[2]; |
377 | } __attribute__ ((packed)); | 377 | } __packed; |
378 | 378 | ||
379 | /* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs | 379 | /* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs |
380 | * like this, for ep0 then the configurable endpoints A..F | 380 | * like this, for ep0 then the configurable endpoints A..F |
@@ -437,16 +437,16 @@ struct net2280_ep_regs { /* [11.9] */ | |||
437 | __le32 ep_avail; | 437 | __le32 ep_avail; |
438 | __le32 ep_data; | 438 | __le32 ep_data; |
439 | u32 _unused0[2]; | 439 | u32 _unused0[2]; |
440 | } __attribute__ ((packed)); | 440 | } __packed; |
441 | 441 | ||
442 | struct net2280_reg_write { | 442 | struct net2280_reg_write { |
443 | __le16 port; | 443 | __le16 port; |
444 | __le32 addr; | 444 | __le32 addr; |
445 | __le32 val; | 445 | __le32 val; |
446 | } __attribute__ ((packed)); | 446 | } __packed; |
447 | 447 | ||
448 | struct net2280_reg_read { | 448 | struct net2280_reg_read { |
449 | __le16 port; | 449 | __le16 port; |
450 | __le32 addr; | 450 | __le32 addr; |
451 | } __attribute__ ((packed)); | 451 | } __packed; |
452 | #endif /* NET2280_H */ | 452 | #endif /* NET2280_H */ |
diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h index 2feead617a3b..ee9bc62a4fa2 100644 --- a/drivers/net/wireless/p54/p54pci.h +++ b/drivers/net/wireless/p54/p54pci.h | |||
@@ -65,7 +65,7 @@ struct p54p_csr { | |||
65 | u8 unused_6[1924]; | 65 | u8 unused_6[1924]; |
66 | u8 cardbus_cis[0x800]; | 66 | u8 cardbus_cis[0x800]; |
67 | u8 direct_mem_win[0x1000]; | 67 | u8 direct_mem_win[0x1000]; |
68 | } __attribute__ ((packed)); | 68 | } __packed; |
69 | 69 | ||
70 | /* usb backend only needs the register defines above */ | 70 | /* usb backend only needs the register defines above */ |
71 | #ifndef P54USB_H | 71 | #ifndef P54USB_H |
@@ -74,7 +74,7 @@ struct p54p_desc { | |||
74 | __le32 device_addr; | 74 | __le32 device_addr; |
75 | __le16 len; | 75 | __le16 len; |
76 | __le16 flags; | 76 | __le16 flags; |
77 | } __attribute__ ((packed)); | 77 | } __packed; |
78 | 78 | ||
79 | struct p54p_ring_control { | 79 | struct p54p_ring_control { |
80 | __le32 host_idx[4]; | 80 | __le32 host_idx[4]; |
@@ -83,7 +83,7 @@ struct p54p_ring_control { | |||
83 | struct p54p_desc tx_data[32]; | 83 | struct p54p_desc tx_data[32]; |
84 | struct p54p_desc rx_mgmt[4]; | 84 | struct p54p_desc rx_mgmt[4]; |
85 | struct p54p_desc tx_mgmt[4]; | 85 | struct p54p_desc tx_mgmt[4]; |
86 | } __attribute__ ((packed)); | 86 | } __packed; |
87 | 87 | ||
88 | #define P54P_READ(r) (__force __le32)__raw_readl(&priv->map->r) | 88 | #define P54P_READ(r) (__force __le32)__raw_readl(&priv->map->r) |
89 | #define P54P_WRITE(r, val) __raw_writel((__force u32)(__le32)(val), &priv->map->r) | 89 | #define P54P_WRITE(r, val) __raw_writel((__force u32)(__le32)(val), &priv->map->r) |
diff --git a/drivers/net/wireless/p54/p54spi.h b/drivers/net/wireless/p54/p54spi.h index 7fbe8d8fc67c..dfaa62aaeb07 100644 --- a/drivers/net/wireless/p54/p54spi.h +++ b/drivers/net/wireless/p54/p54spi.h | |||
@@ -96,7 +96,7 @@ struct p54s_dma_regs { | |||
96 | __le16 cmd; | 96 | __le16 cmd; |
97 | __le16 len; | 97 | __le16 len; |
98 | __le32 addr; | 98 | __le32 addr; |
99 | } __attribute__ ((packed)); | 99 | } __packed; |
100 | 100 | ||
101 | struct p54s_tx_info { | 101 | struct p54s_tx_info { |
102 | struct list_head tx_list; | 102 | struct list_head tx_list; |
diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h index e935b79f7f75..ed4034ade59a 100644 --- a/drivers/net/wireless/p54/p54usb.h +++ b/drivers/net/wireless/p54/p54usb.h | |||
@@ -70,12 +70,12 @@ struct net2280_tx_hdr { | |||
70 | __le16 len; | 70 | __le16 len; |
71 | __le16 follower; /* ? */ | 71 | __le16 follower; /* ? */ |
72 | u8 padding[8]; | 72 | u8 padding[8]; |
73 | } __attribute__((packed)); | 73 | } __packed; |
74 | 74 | ||
75 | struct lm87_tx_hdr { | 75 | struct lm87_tx_hdr { |
76 | __le32 device_addr; | 76 | __le32 device_addr; |
77 | __le32 chksum; | 77 | __le32 chksum; |
78 | } __attribute__((packed)); | 78 | } __packed; |
79 | 79 | ||
80 | /* Some flags for the isl hardware registers controlling DMA inside the | 80 | /* Some flags for the isl hardware registers controlling DMA inside the |
81 | * chip */ | 81 | * chip */ |
@@ -103,7 +103,7 @@ struct x2_header { | |||
103 | __le32 fw_load_addr; | 103 | __le32 fw_load_addr; |
104 | __le32 fw_length; | 104 | __le32 fw_length; |
105 | __le32 crc; | 105 | __le32 crc; |
106 | } __attribute__((packed)); | 106 | } __packed; |
107 | 107 | ||
108 | /* pipes 3 and 4 are not used by the driver */ | 108 | /* pipes 3 and 4 are not used by the driver */ |
109 | #define P54U_PIPE_NUMBER 9 | 109 | #define P54U_PIPE_NUMBER 9 |