prism54 trivial annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/prism54/isl_38xx.h b/drivers/net/wireless/prism54/isl_38xx.h
index 3fadcb6f5297857da8d214be4cb0450e1ad98349..19c33d3137348b52eeb1b98124b0c2a1a1edb972 100644 (file)
--- a/drivers/net/wireless/prism54/isl_38xx.h
+++ b/drivers/net/wireless/prism54/isl_38xx.h
@@ -138,14 +138,14 @@ isl38xx_w32_flush(void __iomem *base, u32 val, unsigned long offset)
 #define MAX_FRAGMENT_SIZE_RX                   1600
 
 typedef struct {
-       u32 address;            /* physical address on host */
-       u16 size;               /* packet size */
-       u16 flags;              /* set of bit-wise flags */
+       __le32 address;         /* physical address on host */
+       __le16 size;            /* packet size */
+       __le16 flags;           /* set of bit-wise flags */
 } isl38xx_fragment;
 
 struct isl38xx_cb {
-       u32 driver_curr_frag[ISL38XX_CB_QCOUNT];
-       u32 device_curr_frag[ISL38XX_CB_QCOUNT];
+       __le32 driver_curr_frag[ISL38XX_CB_QCOUNT];
+       __le32 device_curr_frag[ISL38XX_CB_QCOUNT];
        isl38xx_fragment rx_data_low[ISL38XX_CB_RX_QSIZE];
        isl38xx_fragment tx_data_low[ISL38XX_CB_TX_QSIZE];
        isl38xx_fragment rx_data_high[ISL38XX_CB_RX_QSIZE];

diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index f49eb068c7d0ce232b9535d6d036bf64ae11222c..762e85bef55dcef657ded932a53f911b051ae4b9 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -471,7 +471,7 @@ islpci_eth_receive(islpci_private *priv)
                wmb();
 
                /* increment the driver read pointer */
-               add_le32p((u32 *) &control_block->
+               add_le32p(&control_block->
                          driver_curr_frag[ISL38XX_CB_RX_DATA_LQ], 1);
        }
 

diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h
index 5bf820defbd01b73b906d295bfe3ce40f1e02e80..61454d32d74d31b02456fe0c416cf2e0b5ccd3c2 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_eth.h
+++ b/drivers/net/wireless/prism54/islpci_eth.h
@@ -23,15 +23,15 @@
 #include "islpci_dev.h"
 
 struct rfmon_header {
-       u16 unk0;               /* = 0x0000 */
-       u16 length;             /* = 0x1400 */
-       u32 clock;              /* 1MHz clock */
+       __le16 unk0;            /* = 0x0000 */
+       __le16 length;          /* = 0x1400 */
+       __le32 clock;           /* 1MHz clock */
        u8 flags;
        u8 unk1;
        u8 rate;
        u8 unk2;
-       u16 freq;
-       u16 unk3;
+       __le16 freq;
+       __le16 unk3;
        u8 rssi;
        u8 padding[3];
 } __attribute__ ((packed));
@@ -47,20 +47,20 @@ struct rx_annex_header {
 #define P80211CAPTURE_VERSION 0x80211001
 
 struct avs_80211_1_header {
-       uint32_t version;
-       uint32_t length;
-       uint64_t mactime;
-       uint64_t hosttime;
-       uint32_t phytype;
-       uint32_t channel;
-       uint32_t datarate;
-       uint32_t antenna;
-       uint32_t priority;
-       uint32_t ssi_type;
-       int32_t ssi_signal;
-       int32_t ssi_noise;
-       uint32_t preamble;
-       uint32_t encoding;
+       __be32 version;
+       __be32 length;
+       __be64 mactime;
+       __be64 hosttime;
+       __be32 phytype;
+       __be32 channel;
+       __be32 datarate;
+       __be32 antenna;
+       __be32 priority;
+       __be32 ssi_type;
+       __be32 ssi_signal;
+       __be32 ssi_noise;
+       __be32 preamble;
+       __be32 encoding;
 };
 
 void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *);

diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h
index fc53b587b72238bcaeab9f505bedf55ced865503..f91a88fc1e35b0023faf78daf85780fafb17f495 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_mgt.h
+++ b/drivers/net/wireless/prism54/islpci_mgt.h
@@ -86,7 +86,7 @@ extern int pc_debug;
 #define PIMFOR_FLAG_LITTLE_ENDIAN               0x02
 
 static inline void
-add_le32p(u32 * le_number, u32 add)
+add_le32p(__le32 * le_number, u32 add)
 {
        *le_number = cpu_to_le32(le32_to_cpup(le_number) + add);
 }