Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cb76aa9 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fd6564fc

drivers/net/wireless/rtlwifi/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1509,10 +1509,10 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, 


	if (rtlpriv->use_new_trx_flow) {

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true,

					    HW_DESC_OWN, (u8 *)&hw_queue);

					    HW_DESC_OWN, &hw_queue);

	} else {

		rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, true,

					    HW_DESC_OWN, (u8 *)&temp_one);

					    HW_DESC_OWN, &temp_one);

	}



	if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&

drivers/net/wireless/rtlwifi/rtl8188ee/hw.c

+4 −5
Original line number Diff line number Diff line
@@ -1828,7 +1828,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) 
	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);

	/*customer ID*/

	rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];

	rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];

	if (rtlefuse->eeprom_oemid == 0xFF)

		rtlefuse->eeprom_oemid = 0;
@@ -1845,7 +1845,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) 
	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		 "dev_addr: %pM\n", rtlefuse->dev_addr);

	/*channel plan */

	rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];

	rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];

	/* set channel paln to world wide 13 */

	rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;

	/*tx power*/
@@ -1857,7 +1857,7 @@ static void _rtl88ee_read_adapter_info(struct ieee80211_hw *hw) 
						 rtlefuse->autoload_failflag,

						 hwinfo);

	/*board type*/

	rtlefuse->board_type = (((*(u8 *)&hwinfo[jj]) & 0xE0) >> 5);

	rtlefuse->board_type = (hwinfo[jj] & 0xE0) >> 5;

	/*Wake on wlan*/

	rtlefuse->wowlan_enable = ((hwinfo[kk] & 0x40) >> 6);

	/*parse xtal*/
@@ -2223,8 +2223,7 @@ void rtl88ee_update_channel_access_setting(struct ieee80211_hw *hw) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	u16 sifs_timer;



	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,

				      (u8 *)&mac->slot_time);

	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, &mac->slot_time);

	if (!mac->ht_enable)

		sifs_timer = 0x0a0a;

	else

drivers/net/wireless/rtlwifi/rtl8723ae/hw.c

+3 −4
Original line number Diff line number Diff line
@@ -1628,10 +1628,10 @@ static void _rtl8723ae_read_adapter_info(struct ieee80211_hw *hw, 
	rtl8723ae_read_bt_coexist_info_from_hwpg(hw,

			rtlefuse->autoload_failflag, hwinfo);



	rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];

	rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];

	rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];

	rtlefuse->txpwr_fromeprom = true;

	rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];

	rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
@@ -2051,8 +2051,7 @@ void rtl8723ae_update_channel_access_setting(struct ieee80211_hw *hw) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	u16 sifs_timer;



	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,

				      (u8 *)&mac->slot_time);

	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, &mac->slot_time);

	if (!mac->ht_enable)

		sifs_timer = 0x0a0a;

	else

drivers/net/wireless/rtlwifi/rtl8723be/hw.c

+3 −4
Original line number Diff line number Diff line
@@ -1783,10 +1783,10 @@ static void _rtl8723be_read_adapter_info(struct ieee80211_hw *hw, 
						 rtlefuse->autoload_failflag,

						 hwinfo);



	rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];

	rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];

	rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];

	rtlefuse->txpwr_fromeprom = true;

	rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];

	rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
@@ -2252,8 +2252,7 @@ void rtl8723be_update_channel_access_setting(struct ieee80211_hw *hw) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	u16 sifs_timer;



	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,

				      (u8 *)&mac->slot_time);

	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, &mac->slot_time);

	if (!mac->ht_enable)

		sifs_timer = 0x0a0a;

	else