diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2007-12-22 13:45:50 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:09:11 -0800 |
| commit | 0e5ce1f33049a823f508f4a3f53ba186b12396b8 (patch) | |
| tree | 1bd83ce139e0531d38947d1aa95670f5eca3b826 /drivers/net/wireless/adm8211.c | |
| parent | 5b5e807fb8b56e31319fe8b27e1b072bb80862a8 (diff) | |
| download | kernel_samsung_aries-0e5ce1f33049a823f508f4a3f53ba186b12396b8.zip kernel_samsung_aries-0e5ce1f33049a823f508f4a3f53ba186b12396b8.tar.gz kernel_samsung_aries-0e5ce1f33049a823f508f4a3f53ba186b12396b8.tar.bz2 | |
misc wireless 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/adm8211.c')
| -rw-r--r-- | drivers/net/wireless/adm8211.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 5bf7913..14d90a9 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c @@ -104,7 +104,7 @@ static int adm8211_read_eeprom(struct ieee80211_hw *dev) if (!priv->eeprom) return -ENOMEM; - eeprom_93cx6_multiread(&eeprom, 0, (__le16 __force *)priv->eeprom, words); + eeprom_93cx6_multiread(&eeprom, 0, (__le16 *)priv->eeprom, words); cr49 = le16_to_cpu(priv->eeprom->cr49); priv->rf_type = (cr49 >> 3) & 0x7; @@ -1867,9 +1867,9 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, goto err_iounmap; } - *(u32 *)perm_addr = le32_to_cpu((__force __le32)ADM8211_CSR_READ(PAR0)); - *(u16 *)&perm_addr[4] = - le16_to_cpu((__force __le16)ADM8211_CSR_READ(PAR1) & 0xFFFF); + *(__le32 *)perm_addr = cpu_to_le32(ADM8211_CSR_READ(PAR0)); + *(__le16 *)&perm_addr[4] = + cpu_to_le16(ADM8211_CSR_READ(PAR1) & 0xFFFF); if (!is_valid_ether_addr(perm_addr)) { printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n", |