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

Commit 1851cb4a authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

rtlwifi: Remove casts of pointer to same type 



Casting a pointer to a pointer of the same type is pointless,
so remove these unnecessary casts.

Around these changes:

o Remove unnecessary parentheses
o Use consistent dereference style (change ptr[0] to *ptr)
o Argument alignment

Done via coccinelle script: (and some typing)

$ cat typecast_2.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 45d18c56

drivers/net/wireless/rtlwifi/core.c

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
				u8 keep_alive = 10;

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

						 HW_VAR_KEEP_ALIVE,

						 (u8 *)(&keep_alive));

						 &keep_alive);



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

						      HW_VAR_H2C_FW_JOINBSSRPT,

drivers/net/wireless/rtlwifi/ps.c

+9 −10
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, 
			   unsigned int len)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct ieee80211_mgmt *mgmt = (void *)data;

	struct ieee80211_mgmt *mgmt = data;

	struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info);

	u8 *pos, *end, *ie;

	u16 noa_len;
@@ -858,7 +858,7 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data, 
			      unsigned int len)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct ieee80211_mgmt *mgmt = (void *)data;

	struct ieee80211_mgmt *mgmt = data;

	struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info);

	u8 noa_num, index, i, noa_index = 0;

	u8 *pos, *end, *ie;
@@ -950,9 +950,8 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 
	switch (p2p_ps_state) {

	case P2P_PS_DISABLE:

		p2pinfo->p2p_ps_state = p2p_ps_state;

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

				 HW_VAR_H2C_FW_P2P_PS_OFFLOAD,

				 (u8 *)(&p2p_ps_state));

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

					      &p2p_ps_state);



		p2pinfo->noa_index = 0;

		p2pinfo->ctwindow = 0;
@@ -964,7 +963,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 
				rtlps->smart_ps = 2;

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

					 HW_VAR_H2C_FW_PWRMODE,

					 (u8 *)(&rtlps->pwr_mode));

					 &rtlps->pwr_mode);

			}

		}

		break;
@@ -977,12 +976,12 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 
					rtlps->smart_ps = 0;

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

						 HW_VAR_H2C_FW_PWRMODE,

						 (u8 *)(&rtlps->pwr_mode));

						 &rtlps->pwr_mode);

				}

			}

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

				 HW_VAR_H2C_FW_P2P_PS_OFFLOAD,

				 (u8 *)(&p2p_ps_state));

				 &p2p_ps_state);

		}

		break;

	case P2P_PS_SCAN:
@@ -992,7 +991,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) 
			p2pinfo->p2p_ps_state = p2p_ps_state;

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

				 HW_VAR_H2C_FW_P2P_PS_OFFLOAD,

				 (u8 *)(&p2p_ps_state));

				 &p2p_ps_state);

		}

		break;

	default:
@@ -1012,7 +1011,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	struct ieee80211_hdr *hdr = (void *)data;

	struct ieee80211_hdr *hdr = data;



	if (!mac->p2p)

		return;

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

+2 −3
Original line number Diff line number Diff line
@@ -851,9 +851,8 @@ static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw) 
	} else {

		if (rtlpriv->dm.current_turbo_edca) {

			u8 tmp = AC0_BE;

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

						      HW_VAR_AC_PARAM,

						      (u8 *)(&tmp));

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

						      &tmp);

			rtlpriv->dm.current_turbo_edca = false;

		}

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void _rtl88e_write_fw(struct ieee80211_hw *hw, 
			     enum version_8188e version, u8 *buffer, u32 size)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 *buf_ptr = (u8 *)buffer;

	u8 *buf_ptr = buffer;

	u32 page_no, remain;

	u32 page, offset;
@@ -213,7 +213,7 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw) 
		return 1;



	pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;

	pfwdata = (u8 *)rtlhal->pfirmware;

	pfwdata = rtlhal->pfirmware;

	fwsize = rtlhal->fwsize;

	RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,

		 "normal Firmware SIZE %d\n", fwsize);

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

+26 −31
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw, 
	}



	if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) {

		rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM,

					      (u8 *)(&rpwm_val));

		rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val);

		if (FW_PS_IS_ACK(rpwm_val)) {

			isr_regaddr = REG_HISR;

			content = rtl_read_dword(rtlpriv, isr_regaddr);
@@ -225,7 +224,7 @@ static void _rtl88ee_set_fw_clock_off(struct ieee80211_hw *hw, 
			rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val);

			rtl_write_word(rtlpriv, REG_HISR, 0x0100);

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

						      (u8 *)(&rpwm_val));

						      &rpwm_val);

			spin_lock_bh(&rtlpriv->locks.fw_ps_lock);

			rtlhal->fw_clk_change_in_progress = false;

			spin_unlock_bh(&rtlpriv->locks.fw_ps_lock);
@@ -273,15 +272,14 @@ static void _rtl88ee_fwlps_leave(struct ieee80211_hw *hw) 
		_rtl88ee_set_fw_clock_on(hw, rpwm_val, false);

		rtlhal->allow_sw_to_change_hwclc = false;

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

					      (u8 *)(&fw_pwrmode));

					      &fw_pwrmode);

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

					      (u8 *)(&fw_current_inps));

	} else {

		rpwm_val = FW_PS_STATE_ALL_ON_88E;	/* RF on */

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

					      (u8 *)(&rpwm_val));

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val);

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

					      (u8 *)(&fw_pwrmode));

					      &fw_pwrmode);

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

					      (u8 *)(&fw_current_inps));

	}
@@ -300,7 +298,7 @@ static void _rtl88ee_fwlps_enter(struct ieee80211_hw *hw) 
		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,

					      (u8 *)(&fw_current_inps));

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

					      (u8 *)(&ppsc->fwctrl_psmode));

					      &ppsc->fwctrl_psmode);

		rtlhal->allow_sw_to_change_hwclc = true;

		_rtl88ee_set_fw_clock_off(hw, rpwm_val);

	} else {
@@ -308,9 +306,8 @@ static void _rtl88ee_fwlps_enter(struct ieee80211_hw *hw) 
		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,

					      (u8 *)(&fw_current_inps));

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

					      (u8 *)(&ppsc->fwctrl_psmode));

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

					      (u8 *)(&rpwm_val));

					      &ppsc->fwctrl_psmode);

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val);

	}

}
@@ -419,12 +416,12 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 


		for (e_aci = 0; e_aci < AC_MAX; e_aci++) {

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

						      (u8 *)(&e_aci));

						      &e_aci);

		}

		break; }

	case HW_VAR_ACK_PREAMBLE:{

		u8 reg_tmp;

		u8 short_preamble = (bool) (*(u8 *)val);

		u8 short_preamble = (bool)*val;

		reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL+2);

		if (short_preamble) {

			reg_tmp |= 0x02;
@@ -435,13 +432,13 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		}

		break; }

	case HW_VAR_WPA_CONFIG:

		rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val));

		rtl_write_byte(rtlpriv, REG_SECCFG, *val);

		break;

	case HW_VAR_AMPDU_MIN_SPACE:{

		u8 min_spacing_to_set;

		u8 sec_min_space;



		min_spacing_to_set = *((u8 *)val);

		min_spacing_to_set = *val;

		if (min_spacing_to_set <= 7) {

			sec_min_space = 0;
@@ -464,7 +461,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
	case HW_VAR_SHORTGI_DENSITY:{

		u8 density_to_set;



		density_to_set = *((u8 *)val);

		density_to_set = *val;

		mac->min_space_cfg |= (density_to_set << 3);



		RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
@@ -482,7 +479,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 


		reg = regtoset_normal;



		factor = *((u8 *)val);

		factor = *val;

		if (factor <= 3) {

			factor = (1 << (factor + 2));

			if (factor > 0xf)
@@ -505,15 +502,15 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		}

		break; }

	case HW_VAR_AC_PARAM:{

		u8 e_aci = *((u8 *)val);

		u8 e_aci = *val;

		rtl88e_dm_init_edca_turbo(hw);



		if (rtlpci->acm_method != EACMWAY2_SW)

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

						      (u8 *)(&e_aci));

						      &e_aci);

		break; }

	case HW_VAR_ACM_CTRL:{

		u8 e_aci = *((u8 *)val);

		u8 e_aci = *val;

		union aci_aifsn *p_aci_aifsn =

		    (union aci_aifsn *)(&(mac->ac[0].aifs));

		u8 acm = p_aci_aifsn->f.acm;
@@ -566,7 +563,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		rtlpci->receive_config = ((u32 *)(val))[0];

		break;

	case HW_VAR_RETRY_LIMIT:{

		u8 retry_limit = ((u8 *)(val))[0];

		u8 retry_limit = *val;



		rtl_write_word(rtlpriv, REG_RL,

			       retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -579,7 +576,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		rtlefuse->efuse_usedbytes = *((u16 *)val);

		break;

	case HW_VAR_EFUSE_USAGE:

		rtlefuse->efuse_usedpercentage = *((u8 *)val);

		rtlefuse->efuse_usedpercentage = *val;

		break;

	case HW_VAR_IO_CMD:

		rtl88e_phy_set_io_cmd(hw, (*(enum io_type *)val));
@@ -591,15 +588,13 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		udelay(1);



		if (rpwm_val & BIT(7)) {

			rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,

				       (*(u8 *)val));

			rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val);

		} else {

			rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,

				       ((*(u8 *)val) | BIT(7)));

			rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val | BIT(7));

		}

		break; }

	case HW_VAR_H2C_FW_PWRMODE:

		rtl88e_set_fw_pwrmode_cmd(hw, (*(u8 *)val));

		rtl88e_set_fw_pwrmode_cmd(hw, *val);

		break;

	case HW_VAR_FW_PSMODE_STATUS:

		ppsc->fw_current_inpsmode = *((bool *)val);
@@ -616,7 +611,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			_rtl88ee_fwlps_leave(hw);

		 break; }

	case HW_VAR_H2C_FW_JOINBSSRPT:{

		u8 mstatus = (*(u8 *)val);

		u8 mstatus = *val;

		u8 tmp, tmp_reg422, uval;

		u8 count = 0, dlbcn_count = 0;

		bool recover = false;
@@ -667,10 +662,10 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			}

			rtl_write_byte(rtlpriv, REG_CR + 1, (tmp & ~(BIT(0))));

		}

		rtl88e_set_fw_joinbss_report_cmd(hw, (*(u8 *)val));

		rtl88e_set_fw_joinbss_report_cmd(hw, *val);

		break; }

	case HW_VAR_H2C_FW_P2P_PS_OFFLOAD:

		rtl88e_set_p2p_ps_offload_cmd(hw, (*(u8 *)val));

		rtl88e_set_p2p_ps_offload_cmd(hw, *val);

		break;

	case HW_VAR_AID:{

		u16 u2btmp;
@@ -680,7 +675,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			       mac->assoc_id));

		break; }

	case HW_VAR_CORRECT_TSF:{

		u8 btype_ibss = ((u8 *)(val))[0];

		u8 btype_ibss = *val;



		if (btype_ibss == true)

			_rtl88ee_stop_tx_beacon(hw);