diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2007-12-21 03:30:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:09:05 -0500 |
commit | 8a9faf3cd08b91aca1502dbe18e3b5063fda2e87 (patch) | |
tree | 4588f25ca8cd11833252370c3b0c7566004de050 /drivers/net/wireless/hostap/hostap_pci.c | |
parent | 3eb9b41f2474c53fe469fbe383955d5aae9e76e4 (diff) |
hostap annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_pci.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index fc876ba1857..3a874fc621d 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c | |||
@@ -128,8 +128,8 @@ static inline u16 hfa384x_inw_debug(struct net_device *dev, int a) | |||
128 | #define HFA384X_INB(a) hfa384x_inb_debug(dev, (a)) | 128 | #define HFA384X_INB(a) hfa384x_inb_debug(dev, (a)) |
129 | #define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v)) | 129 | #define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v)) |
130 | #define HFA384X_INW(a) hfa384x_inw_debug(dev, (a)) | 130 | #define HFA384X_INW(a) hfa384x_inw_debug(dev, (a)) |
131 | #define HFA384X_OUTW_DATA(v,a) hfa384x_outw_debug(dev, (a), cpu_to_le16((v))) | 131 | #define HFA384X_OUTW_DATA(v,a) hfa384x_outw_debug(dev, (a), le16_to_cpu((v))) |
132 | #define HFA384X_INW_DATA(a) (u16) le16_to_cpu(hfa384x_inw_debug(dev, (a))) | 132 | #define HFA384X_INW_DATA(a) cpu_to_le16(hfa384x_inw_debug(dev, (a))) |
133 | 133 | ||
134 | #else /* PRISM2_IO_DEBUG */ | 134 | #else /* PRISM2_IO_DEBUG */ |
135 | 135 | ||
@@ -173,8 +173,8 @@ static inline u16 hfa384x_inw(struct net_device *dev, int a) | |||
173 | #define HFA384X_INB(a) hfa384x_inb(dev, (a)) | 173 | #define HFA384X_INB(a) hfa384x_inb(dev, (a)) |
174 | #define HFA384X_OUTW(v,a) hfa384x_outw(dev, (a), (v)) | 174 | #define HFA384X_OUTW(v,a) hfa384x_outw(dev, (a), (v)) |
175 | #define HFA384X_INW(a) hfa384x_inw(dev, (a)) | 175 | #define HFA384X_INW(a) hfa384x_inw(dev, (a)) |
176 | #define HFA384X_OUTW_DATA(v,a) hfa384x_outw(dev, (a), cpu_to_le16((v))) | 176 | #define HFA384X_OUTW_DATA(v,a) hfa384x_outw(dev, (a), le16_to_cpu((v))) |
177 | #define HFA384X_INW_DATA(a) (u16) le16_to_cpu(hfa384x_inw(dev, (a))) | 177 | #define HFA384X_INW_DATA(a) cpu_to_le16(hfa384x_inw(dev, (a))) |
178 | 178 | ||
179 | #endif /* PRISM2_IO_DEBUG */ | 179 | #endif /* PRISM2_IO_DEBUG */ |
180 | 180 | ||
@@ -183,10 +183,10 @@ static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf, | |||
183 | int len) | 183 | int len) |
184 | { | 184 | { |
185 | u16 d_off; | 185 | u16 d_off; |
186 | u16 *pos; | 186 | __le16 *pos; |
187 | 187 | ||
188 | d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF; | 188 | d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF; |
189 | pos = (u16 *) buf; | 189 | pos = (__le16 *) buf; |
190 | 190 | ||
191 | for ( ; len > 1; len -= 2) | 191 | for ( ; len > 1; len -= 2) |
192 | *pos++ = HFA384X_INW_DATA(d_off); | 192 | *pos++ = HFA384X_INW_DATA(d_off); |
@@ -201,10 +201,10 @@ static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf, | |||
201 | static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len) | 201 | static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len) |
202 | { | 202 | { |
203 | u16 d_off; | 203 | u16 d_off; |
204 | u16 *pos; | 204 | __le16 *pos; |
205 | 205 | ||
206 | d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF; | 206 | d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF; |
207 | pos = (u16 *) buf; | 207 | pos = (__le16 *) buf; |
208 | 208 | ||
209 | for ( ; len > 1; len -= 2) | 209 | for ( ; len > 1; len -= 2) |
210 | HFA384X_OUTW_DATA(*pos++, d_off); | 210 | HFA384X_OUTW_DATA(*pos++, d_off); |