diff options
author | Joe Perches <joe@perches.com> | 2014-03-24 13:46:20 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-27 14:20:05 -0400 |
commit | 9cb76aa994682c7a5584cf4a03aeedd7ef1204bd (patch) | |
tree | 7733dfba8ae7e0f8ddd0ce024f119a9b8d6f9502 /drivers/net/wireless/rtlwifi | |
parent | fd6564fcdc0bfcd432e6e939f9538acc3905d08a (diff) |
rtlwifi: Remove addressof casts to same type
Using addressof then casting to the original type is pointless,
so remove these unnecessary casts.
Done via coccinelle script:
$ cat typecast.cocci
@@
type T;
T foo;
@@
- (T *)&foo
+ &foo
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 7 |
4 files changed, 12 insertions, 15 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index f26f4ffc771d..7d711708d2f3 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -1509,10 +1509,10 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, | |||
1509 | 1509 | ||
1510 | if (rtlpriv->use_new_trx_flow) { | 1510 | if (rtlpriv->use_new_trx_flow) { |
1511 | rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true, | 1511 | rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true, |
1512 | HW_DESC_OWN, (u8 *)&hw_queue); | 1512 | HW_DESC_OWN, &hw_queue); |
1513 | } else { | 1513 | } else { |
1514 | rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true, | 1514 | rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true, |
1515 | HW_DESC_OWN, (u8 *)&temp_one); | 1515 | HW_DESC_OWN, &temp_one); |
1516 | } | 1516 | } |
1517 | 1517 | ||
1518 | if ((ring->entries - skb_queue_len(&ring->queue)) < 2 && | 1518 | if ((ring->entries - skb_queue_len(&ring->queue)) < 2 && |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index bd2a26bafb69..5a30e4e551a9 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | |||
@@ -1828,7 +1828,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) | |||
1828 | RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, | 1828 | RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
1829 | "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid); | 1829 | "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid); |
1830 | /*customer ID*/ | 1830 | /*customer ID*/ |
1831 | rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID]; | 1831 | rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID]; |
1832 | if (rtlefuse->eeprom_oemid == 0xFF) | 1832 | if (rtlefuse->eeprom_oemid == 0xFF) |
1833 | rtlefuse->eeprom_oemid = 0; | 1833 | rtlefuse->eeprom_oemid = 0; |
1834 | 1834 | ||
@@ -1845,7 +1845,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) | |||
1845 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 1845 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
1846 | "dev_addr: %pM\n", rtlefuse->dev_addr); | 1846 | "dev_addr: %pM\n", rtlefuse->dev_addr); |
1847 | /*channel plan */ | 1847 | /*channel plan */ |
1848 | rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN]; | 1848 | rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN]; |
1849 | /* set channel paln to world wide 13 */ | 1849 | /* set channel paln to world wide 13 */ |
1850 | rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13; | 1850 | rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13; |
1851 | /*tx power*/ | 1851 | /*tx power*/ |
@@ -1857,7 +1857,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) | |||
1857 | rtlefuse->autoload_failflag, | 1857 | rtlefuse->autoload_failflag, |
1858 | hwinfo); | 1858 | hwinfo); |
1859 | /*board type*/ | 1859 | /*board type*/ |
1860 | rtlefuse->board_type = (((*(u8 *)&hwinfo[jj]) & 0xE0) >> 5); | 1860 | rtlefuse->board_type = (hwinfo[jj] & 0xE0) >> 5; |
1861 | /*Wake on wlan*/ | 1861 | /*Wake on wlan*/ |
1862 | rtlefuse->wowlan_enable = ((hwinfo[kk] & 0x40) >> 6); | 1862 | rtlefuse->wowlan_enable = ((hwinfo[kk] & 0x40) >> 6); |
1863 | /*parse xtal*/ | 1863 | /*parse xtal*/ |
@@ -2223,8 +2223,7 @@ void rtl88ee_update_channel_access_setting(struct ieee80211_hw *hw) | |||
2223 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 2223 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
2224 | u16 sifs_timer; | 2224 | u16 sifs_timer; |
2225 | 2225 | ||
2226 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, | 2226 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, &mac->slot_time); |
2227 | (u8 *)&mac->slot_time); | ||
2228 | if (!mac->ht_enable) | 2227 | if (!mac->ht_enable) |
2229 | sifs_timer = 0x0a0a; | 2228 | sifs_timer = 0x0a0a; |
2230 | else | 2229 | else |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c index f4c9852d1e1e..dd383b1482e9 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | |||
@@ -1628,10 +1628,10 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw, | |||
1628 | rtl8723ae_read_bt_coexist_info_from_hwpg(hw, | 1628 | rtl8723ae_read_bt_coexist_info_from_hwpg(hw, |
1629 | rtlefuse->autoload_failflag, hwinfo); | 1629 | rtlefuse->autoload_failflag, hwinfo); |
1630 | 1630 | ||
1631 | rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN]; | 1631 | rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN]; |
1632 | rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION]; | 1632 | rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION]; |
1633 | rtlefuse->txpwr_fromeprom = true; | 1633 | rtlefuse->txpwr_fromeprom = true; |
1634 | rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID]; | 1634 | rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID]; |
1635 | 1635 | ||
1636 | RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, | 1636 | RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
1637 | "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid); | 1637 | "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid); |
@@ -2051,8 +2051,7 @@ void rtl8723ae_update_channel_access_setting(struct ieee80211_hw *hw) | |||
2051 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 2051 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
2052 | u16 sifs_timer; | 2052 | u16 sifs_timer; |
2053 | 2053 | ||
2054 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, | 2054 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, &mac->slot_time); |
2055 | (u8 *)&mac->slot_time); | ||
2056 | if (!mac->ht_enable) | 2055 | if (!mac->ht_enable) |
2057 | sifs_timer = 0x0a0a; | 2056 | sifs_timer = 0x0a0a; |
2058 | else | 2057 | else |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c index 7e70c7108d91..223728ddc82a 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c | |||
@@ -1783,10 +1783,10 @@ static void _rtl8723be_read_adapter_info(struct ieee80211_hw *hw, | |||
1783 | rtlefuse->autoload_failflag, | 1783 | rtlefuse->autoload_failflag, |
1784 | hwinfo); | 1784 | hwinfo); |
1785 | 1785 | ||
1786 | rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN]; | 1786 | rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN]; |
1787 | rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION]; | 1787 | rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION]; |
1788 | rtlefuse->txpwr_fromeprom = true; | 1788 | rtlefuse->txpwr_fromeprom = true; |
1789 | rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID]; | 1789 | rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID]; |
1790 | 1790 | ||
1791 | RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, | 1791 | RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
1792 | "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid); | 1792 | "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid); |
@@ -2252,8 +2252,7 @@ void rtl8723be_update_channel_access_setting(struct ieee80211_hw *hw) | |||
2252 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 2252 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
2253 | u16 sifs_timer; | 2253 | u16 sifs_timer; |
2254 | 2254 | ||
2255 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, | 2255 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, &mac->slot_time); |
2256 | (u8 *)&mac->slot_time); | ||
2257 | if (!mac->ht_enable) | 2256 | if (!mac->ht_enable) |
2258 | sifs_timer = 0x0a0a; | 2257 | sifs_timer = 0x0a0a; |
2259 | else | 2258 | else |