diff options
author | Joe Perches <joe@perches.com> | 2014-03-24 16:15:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-27 14:20:05 -0400 |
commit | 1851cb4a0f08ba0600103203c4b52e53c744f59c (patch) | |
tree | 307ef25b2e01f757db84972c3c0bcd608dccbea1 | |
parent | 45d18c562adefe9d807c0ba833affdeff68bad98 (diff) |
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: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rtlwifi/core.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/ps.c | 19 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/fw.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 57 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 60 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 57 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c | 4 |
15 files changed, 118 insertions, 137 deletions
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index ded691f76f2f..4ec424f26672 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c | |||
@@ -982,7 +982,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
982 | u8 keep_alive = 10; | 982 | u8 keep_alive = 10; |
983 | rtlpriv->cfg->ops->set_hw_reg(hw, | 983 | rtlpriv->cfg->ops->set_hw_reg(hw, |
984 | HW_VAR_KEEP_ALIVE, | 984 | HW_VAR_KEEP_ALIVE, |
985 | (u8 *)(&keep_alive)); | 985 | &keep_alive); |
986 | 986 | ||
987 | rtlpriv->cfg->ops->set_hw_reg(hw, | 987 | rtlpriv->cfg->ops->set_hw_reg(hw, |
988 | HW_VAR_H2C_FW_JOINBSSRPT, | 988 | HW_VAR_H2C_FW_JOINBSSRPT, |
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index de7f05f848ef..50504942ded1 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c | |||
@@ -759,7 +759,7 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, | |||
759 | unsigned int len) | 759 | unsigned int len) |
760 | { | 760 | { |
761 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 761 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
762 | struct ieee80211_mgmt *mgmt = (void *)data; | 762 | struct ieee80211_mgmt *mgmt = data; |
763 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); | 763 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); |
764 | u8 *pos, *end, *ie; | 764 | u8 *pos, *end, *ie; |
765 | u16 noa_len; | 765 | u16 noa_len; |
@@ -858,7 +858,7 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data, | |||
858 | unsigned int len) | 858 | unsigned int len) |
859 | { | 859 | { |
860 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 860 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
861 | struct ieee80211_mgmt *mgmt = (void *)data; | 861 | struct ieee80211_mgmt *mgmt = data; |
862 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); | 862 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); |
863 | u8 noa_num, index, i, noa_index = 0; | 863 | u8 noa_num, index, i, noa_index = 0; |
864 | u8 *pos, *end, *ie; | 864 | u8 *pos, *end, *ie; |
@@ -950,9 +950,8 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
950 | switch (p2p_ps_state) { | 950 | switch (p2p_ps_state) { |
951 | case P2P_PS_DISABLE: | 951 | case P2P_PS_DISABLE: |
952 | p2pinfo->p2p_ps_state = p2p_ps_state; | 952 | p2pinfo->p2p_ps_state = p2p_ps_state; |
953 | rtlpriv->cfg->ops->set_hw_reg(hw, | 953 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, |
954 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, | 954 | &p2p_ps_state); |
955 | (u8 *)(&p2p_ps_state)); | ||
956 | 955 | ||
957 | p2pinfo->noa_index = 0; | 956 | p2pinfo->noa_index = 0; |
958 | p2pinfo->ctwindow = 0; | 957 | p2pinfo->ctwindow = 0; |
@@ -964,7 +963,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
964 | rtlps->smart_ps = 2; | 963 | rtlps->smart_ps = 2; |
965 | rtlpriv->cfg->ops->set_hw_reg(hw, | 964 | rtlpriv->cfg->ops->set_hw_reg(hw, |
966 | HW_VAR_H2C_FW_PWRMODE, | 965 | HW_VAR_H2C_FW_PWRMODE, |
967 | (u8 *)(&rtlps->pwr_mode)); | 966 | &rtlps->pwr_mode); |
968 | } | 967 | } |
969 | } | 968 | } |
970 | break; | 969 | break; |
@@ -977,12 +976,12 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
977 | rtlps->smart_ps = 0; | 976 | rtlps->smart_ps = 0; |
978 | rtlpriv->cfg->ops->set_hw_reg(hw, | 977 | rtlpriv->cfg->ops->set_hw_reg(hw, |
979 | HW_VAR_H2C_FW_PWRMODE, | 978 | HW_VAR_H2C_FW_PWRMODE, |
980 | (u8 *)(&rtlps->pwr_mode)); | 979 | &rtlps->pwr_mode); |
981 | } | 980 | } |
982 | } | 981 | } |
983 | rtlpriv->cfg->ops->set_hw_reg(hw, | 982 | rtlpriv->cfg->ops->set_hw_reg(hw, |
984 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, | 983 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, |
985 | (u8 *)(&p2p_ps_state)); | 984 | &p2p_ps_state); |
986 | } | 985 | } |
987 | break; | 986 | break; |
988 | case P2P_PS_SCAN: | 987 | case P2P_PS_SCAN: |
@@ -992,7 +991,7 @@ void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state) | |||
992 | p2pinfo->p2p_ps_state = p2p_ps_state; | 991 | p2pinfo->p2p_ps_state = p2p_ps_state; |
993 | rtlpriv->cfg->ops->set_hw_reg(hw, | 992 | rtlpriv->cfg->ops->set_hw_reg(hw, |
994 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, | 993 | HW_VAR_H2C_FW_P2P_PS_OFFLOAD, |
995 | (u8 *)(&p2p_ps_state)); | 994 | &p2p_ps_state); |
996 | } | 995 | } |
997 | break; | 996 | break; |
998 | default: | 997 | default: |
@@ -1012,7 +1011,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len) | |||
1012 | { | 1011 | { |
1013 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1012 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
1014 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 1013 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
1015 | struct ieee80211_hdr *hdr = (void *)data; | 1014 | struct ieee80211_hdr *hdr = data; |
1016 | 1015 | ||
1017 | if (!mac->p2p) | 1016 | if (!mac->p2p) |
1018 | return; | 1017 | return; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c index 97bc9aa5e1d1..f8daa61cf1c3 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | |||
@@ -851,9 +851,8 @@ static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw) | |||
851 | } else { | 851 | } else { |
852 | if (rtlpriv->dm.current_turbo_edca) { | 852 | if (rtlpriv->dm.current_turbo_edca) { |
853 | u8 tmp = AC0_BE; | 853 | u8 tmp = AC0_BE; |
854 | rtlpriv->cfg->ops->set_hw_reg(hw, | 854 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, |
855 | HW_VAR_AC_PARAM, | 855 | &tmp); |
856 | (u8 *)(&tmp)); | ||
857 | rtlpriv->dm.current_turbo_edca = false; | 856 | rtlpriv->dm.current_turbo_edca = false; |
858 | } | 857 | } |
859 | } | 858 | } |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c index 557bc5b8327e..4f9376ad4739 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c | |||
@@ -119,7 +119,7 @@ static void _rtl88e_write_fw(struct ieee80211_hw *hw, | |||
119 | enum version_8188e version, u8 *buffer, u32 size) | 119 | enum version_8188e version, u8 *buffer, u32 size) |
120 | { | 120 | { |
121 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 121 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
122 | u8 *buf_ptr = (u8 *)buffer; | 122 | u8 *buf_ptr = buffer; |
123 | u32 page_no, remain; | 123 | u32 page_no, remain; |
124 | u32 page, offset; | 124 | u32 page, offset; |
125 | 125 | ||
@@ -213,7 +213,7 @@ int rtl88e_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw) | |||
213 | return 1; | 213 | return 1; |
214 | 214 | ||
215 | pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware; | 215 | pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware; |
216 | pfwdata = (u8 *)rtlhal->pfirmware; | 216 | pfwdata = rtlhal->pfirmware; |
217 | fwsize = rtlhal->fwsize; | 217 | fwsize = rtlhal->fwsize; |
218 | RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, | 218 | RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, |
219 | "normal Firmware SIZE %d\n", fwsize); | 219 | "normal Firmware SIZE %d\n", fwsize); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index 5a30e4e551a9..94cd9df98381 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | |||
@@ -147,8 +147,7 @@ static void _rtl88ee_set_fw_clock_on(struct ieee80211_hw *hw, | |||
147 | } | 147 | } |
148 | 148 | ||
149 | if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) { | 149 | if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) { |
150 | rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM, | 150 | rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val); |
151 | (u8 *)(&rpwm_val)); | ||
152 | if (FW_PS_IS_ACK(rpwm_val)) { | 151 | if (FW_PS_IS_ACK(rpwm_val)) { |
153 | isr_regaddr = REG_HISR; | 152 | isr_regaddr = REG_HISR; |
154 | content = rtl_read_dword(rtlpriv, isr_regaddr); | 153 | content = rtl_read_dword(rtlpriv, isr_regaddr); |
@@ -225,7 +224,7 @@ static void _rtl88ee_set_fw_clock_off(struct ieee80211_hw *hw, | |||
225 | rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val); | 224 | rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val); |
226 | rtl_write_word(rtlpriv, REG_HISR, 0x0100); | 225 | rtl_write_word(rtlpriv, REG_HISR, 0x0100); |
227 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 226 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, |
228 | (u8 *)(&rpwm_val)); | 227 | &rpwm_val); |
229 | spin_lock_bh(&rtlpriv->locks.fw_ps_lock); | 228 | spin_lock_bh(&rtlpriv->locks.fw_ps_lock); |
230 | rtlhal->fw_clk_change_in_progress = false; | 229 | rtlhal->fw_clk_change_in_progress = false; |
231 | spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); | 230 | spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); |
@@ -273,15 +272,14 @@ static void _rtl88ee_fwlps_leave(struct ieee80211_hw *hw) | |||
273 | _rtl88ee_set_fw_clock_on(hw, rpwm_val, false); | 272 | _rtl88ee_set_fw_clock_on(hw, rpwm_val, false); |
274 | rtlhal->allow_sw_to_change_hwclc = false; | 273 | rtlhal->allow_sw_to_change_hwclc = false; |
275 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 274 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
276 | (u8 *)(&fw_pwrmode)); | 275 | &fw_pwrmode); |
277 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 276 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
278 | (u8 *)(&fw_current_inps)); | 277 | (u8 *)(&fw_current_inps)); |
279 | } else { | 278 | } else { |
280 | rpwm_val = FW_PS_STATE_ALL_ON_88E; /* RF on */ | 279 | rpwm_val = FW_PS_STATE_ALL_ON_88E; /* RF on */ |
281 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 280 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val); |
282 | (u8 *)(&rpwm_val)); | ||
283 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 281 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
284 | (u8 *)(&fw_pwrmode)); | 282 | &fw_pwrmode); |
285 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 283 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
286 | (u8 *)(&fw_current_inps)); | 284 | (u8 *)(&fw_current_inps)); |
287 | } | 285 | } |
@@ -300,7 +298,7 @@ static void _rtl88ee_fwlps_enter(struct ieee80211_hw *hw) | |||
300 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 298 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
301 | (u8 *)(&fw_current_inps)); | 299 | (u8 *)(&fw_current_inps)); |
302 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 300 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
303 | (u8 *)(&ppsc->fwctrl_psmode)); | 301 | &ppsc->fwctrl_psmode); |
304 | rtlhal->allow_sw_to_change_hwclc = true; | 302 | rtlhal->allow_sw_to_change_hwclc = true; |
305 | _rtl88ee_set_fw_clock_off(hw, rpwm_val); | 303 | _rtl88ee_set_fw_clock_off(hw, rpwm_val); |
306 | } else { | 304 | } else { |
@@ -308,9 +306,8 @@ static void _rtl88ee_fwlps_enter(struct ieee80211_hw *hw) | |||
308 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 306 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
309 | (u8 *)(&fw_current_inps)); | 307 | (u8 *)(&fw_current_inps)); |
310 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 308 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
311 | (u8 *)(&ppsc->fwctrl_psmode)); | 309 | &ppsc->fwctrl_psmode); |
312 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 310 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val); |
313 | (u8 *)(&rpwm_val)); | ||
314 | } | 311 | } |
315 | } | 312 | } |
316 | 313 | ||
@@ -419,12 +416,12 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
419 | 416 | ||
420 | for (e_aci = 0; e_aci < AC_MAX; e_aci++) { | 417 | for (e_aci = 0; e_aci < AC_MAX; e_aci++) { |
421 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, | 418 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, |
422 | (u8 *)(&e_aci)); | 419 | &e_aci); |
423 | } | 420 | } |
424 | break; } | 421 | break; } |
425 | case HW_VAR_ACK_PREAMBLE:{ | 422 | case HW_VAR_ACK_PREAMBLE:{ |
426 | u8 reg_tmp; | 423 | u8 reg_tmp; |
427 | u8 short_preamble = (bool) (*(u8 *)val); | 424 | u8 short_preamble = (bool)*val; |
428 | reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL+2); | 425 | reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL+2); |
429 | if (short_preamble) { | 426 | if (short_preamble) { |
430 | reg_tmp |= 0x02; | 427 | reg_tmp |= 0x02; |
@@ -435,13 +432,13 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
435 | } | 432 | } |
436 | break; } | 433 | break; } |
437 | case HW_VAR_WPA_CONFIG: | 434 | case HW_VAR_WPA_CONFIG: |
438 | rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val)); | 435 | rtl_write_byte(rtlpriv, REG_SECCFG, *val); |
439 | break; | 436 | break; |
440 | case HW_VAR_AMPDU_MIN_SPACE:{ | 437 | case HW_VAR_AMPDU_MIN_SPACE:{ |
441 | u8 min_spacing_to_set; | 438 | u8 min_spacing_to_set; |
442 | u8 sec_min_space; | 439 | u8 sec_min_space; |
443 | 440 | ||
444 | min_spacing_to_set = *((u8 *)val); | 441 | min_spacing_to_set = *val; |
445 | if (min_spacing_to_set <= 7) { | 442 | if (min_spacing_to_set <= 7) { |
446 | sec_min_space = 0; | 443 | sec_min_space = 0; |
447 | 444 | ||
@@ -464,7 +461,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
464 | case HW_VAR_SHORTGI_DENSITY:{ | 461 | case HW_VAR_SHORTGI_DENSITY:{ |
465 | u8 density_to_set; | 462 | u8 density_to_set; |
466 | 463 | ||
467 | density_to_set = *((u8 *)val); | 464 | density_to_set = *val; |
468 | mac->min_space_cfg |= (density_to_set << 3); | 465 | mac->min_space_cfg |= (density_to_set << 3); |
469 | 466 | ||
470 | RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, | 467 | RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, |
@@ -482,7 +479,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
482 | 479 | ||
483 | reg = regtoset_normal; | 480 | reg = regtoset_normal; |
484 | 481 | ||
485 | factor = *((u8 *)val); | 482 | factor = *val; |
486 | if (factor <= 3) { | 483 | if (factor <= 3) { |
487 | factor = (1 << (factor + 2)); | 484 | factor = (1 << (factor + 2)); |
488 | if (factor > 0xf) | 485 | if (factor > 0xf) |
@@ -505,15 +502,15 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
505 | } | 502 | } |
506 | break; } | 503 | break; } |
507 | case HW_VAR_AC_PARAM:{ | 504 | case HW_VAR_AC_PARAM:{ |
508 | u8 e_aci = *((u8 *)val); | 505 | u8 e_aci = *val; |
509 | rtl88e_dm_init_edca_turbo(hw); | 506 | rtl88e_dm_init_edca_turbo(hw); |
510 | 507 | ||
511 | if (rtlpci->acm_method != EACMWAY2_SW) | 508 | if (rtlpci->acm_method != EACMWAY2_SW) |
512 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL, | 509 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL, |
513 | (u8 *)(&e_aci)); | 510 | &e_aci); |
514 | break; } | 511 | break; } |
515 | case HW_VAR_ACM_CTRL:{ | 512 | case HW_VAR_ACM_CTRL:{ |
516 | u8 e_aci = *((u8 *)val); | 513 | u8 e_aci = *val; |
517 | union aci_aifsn *p_aci_aifsn = | 514 | union aci_aifsn *p_aci_aifsn = |
518 | (union aci_aifsn *)(&(mac->ac[0].aifs)); | 515 | (union aci_aifsn *)(&(mac->ac[0].aifs)); |
519 | u8 acm = p_aci_aifsn->f.acm; | 516 | u8 acm = p_aci_aifsn->f.acm; |
@@ -566,7 +563,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
566 | rtlpci->receive_config = ((u32 *)(val))[0]; | 563 | rtlpci->receive_config = ((u32 *)(val))[0]; |
567 | break; | 564 | break; |
568 | case HW_VAR_RETRY_LIMIT:{ | 565 | case HW_VAR_RETRY_LIMIT:{ |
569 | u8 retry_limit = ((u8 *)(val))[0]; | 566 | u8 retry_limit = *val; |
570 | 567 | ||
571 | rtl_write_word(rtlpriv, REG_RL, | 568 | rtl_write_word(rtlpriv, REG_RL, |
572 | retry_limit << RETRY_LIMIT_SHORT_SHIFT | | 569 | retry_limit << RETRY_LIMIT_SHORT_SHIFT | |
@@ -579,7 +576,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
579 | rtlefuse->efuse_usedbytes = *((u16 *)val); | 576 | rtlefuse->efuse_usedbytes = *((u16 *)val); |
580 | break; | 577 | break; |
581 | case HW_VAR_EFUSE_USAGE: | 578 | case HW_VAR_EFUSE_USAGE: |
582 | rtlefuse->efuse_usedpercentage = *((u8 *)val); | 579 | rtlefuse->efuse_usedpercentage = *val; |
583 | break; | 580 | break; |
584 | case HW_VAR_IO_CMD: | 581 | case HW_VAR_IO_CMD: |
585 | rtl88e_phy_set_io_cmd(hw, (*(enum io_type *)val)); | 582 | 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) | |||
591 | udelay(1); | 588 | udelay(1); |
592 | 589 | ||
593 | if (rpwm_val & BIT(7)) { | 590 | if (rpwm_val & BIT(7)) { |
594 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, | 591 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val); |
595 | (*(u8 *)val)); | ||
596 | } else { | 592 | } else { |
597 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, | 593 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val | BIT(7)); |
598 | ((*(u8 *)val) | BIT(7))); | ||
599 | } | 594 | } |
600 | break; } | 595 | break; } |
601 | case HW_VAR_H2C_FW_PWRMODE: | 596 | case HW_VAR_H2C_FW_PWRMODE: |
602 | rtl88e_set_fw_pwrmode_cmd(hw, (*(u8 *)val)); | 597 | rtl88e_set_fw_pwrmode_cmd(hw, *val); |
603 | break; | 598 | break; |
604 | case HW_VAR_FW_PSMODE_STATUS: | 599 | case HW_VAR_FW_PSMODE_STATUS: |
605 | ppsc->fw_current_inpsmode = *((bool *)val); | 600 | ppsc->fw_current_inpsmode = *((bool *)val); |
@@ -616,7 +611,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
616 | _rtl88ee_fwlps_leave(hw); | 611 | _rtl88ee_fwlps_leave(hw); |
617 | break; } | 612 | break; } |
618 | case HW_VAR_H2C_FW_JOINBSSRPT:{ | 613 | case HW_VAR_H2C_FW_JOINBSSRPT:{ |
619 | u8 mstatus = (*(u8 *)val); | 614 | u8 mstatus = *val; |
620 | u8 tmp, tmp_reg422, uval; | 615 | u8 tmp, tmp_reg422, uval; |
621 | u8 count = 0, dlbcn_count = 0; | 616 | u8 count = 0, dlbcn_count = 0; |
622 | bool recover = false; | 617 | bool recover = false; |
@@ -667,10 +662,10 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
667 | } | 662 | } |
668 | rtl_write_byte(rtlpriv, REG_CR + 1, (tmp & ~(BIT(0)))); | 663 | rtl_write_byte(rtlpriv, REG_CR + 1, (tmp & ~(BIT(0)))); |
669 | } | 664 | } |
670 | rtl88e_set_fw_joinbss_report_cmd(hw, (*(u8 *)val)); | 665 | rtl88e_set_fw_joinbss_report_cmd(hw, *val); |
671 | break; } | 666 | break; } |
672 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: | 667 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: |
673 | rtl88e_set_p2p_ps_offload_cmd(hw, (*(u8 *)val)); | 668 | rtl88e_set_p2p_ps_offload_cmd(hw, *val); |
674 | break; | 669 | break; |
675 | case HW_VAR_AID:{ | 670 | case HW_VAR_AID:{ |
676 | u16 u2btmp; | 671 | u16 u2btmp; |
@@ -680,7 +675,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
680 | mac->assoc_id)); | 675 | mac->assoc_id)); |
681 | break; } | 676 | break; } |
682 | case HW_VAR_CORRECT_TSF:{ | 677 | case HW_VAR_CORRECT_TSF:{ |
683 | u8 btype_ibss = ((u8 *)(val))[0]; | 678 | u8 btype_ibss = *val; |
684 | 679 | ||
685 | if (btype_ibss == true) | 680 | if (btype_ibss == true) |
686 | _rtl88ee_stop_tx_beacon(hw); | 681 | _rtl88ee_stop_tx_beacon(hw); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c index 2ba6f510d884..06ef47cd6203 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | |||
@@ -497,7 +497,7 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw, | |||
497 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 497 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
498 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 498 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
499 | struct rtl_hal *rtlhal = rtl_hal(rtlpriv); | 499 | struct rtl_hal *rtlhal = rtl_hal(rtlpriv); |
500 | u8 *pdesc = (u8 *)pdesc_tx; | 500 | u8 *pdesc = pdesc_tx; |
501 | u16 seq_number; | 501 | u16 seq_number; |
502 | __le16 fc = hdr->frame_control; | 502 | __le16 fc = hdr->frame_control; |
503 | unsigned int buf_len = 0; | 503 | unsigned int buf_len = 0; |
@@ -716,7 +716,7 @@ void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, | |||
716 | 716 | ||
717 | SET_TX_DESC_OWN(pdesc, 1); | 717 | SET_TX_DESC_OWN(pdesc, 1); |
718 | 718 | ||
719 | SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len)); | 719 | SET_TX_DESC_PKT_SIZE(pdesc, (u16)(skb->len)); |
720 | 720 | ||
721 | SET_TX_DESC_FIRST_SEG(pdesc, 1); | 721 | SET_TX_DESC_FIRST_SEG(pdesc, 1); |
722 | SET_TX_DESC_LAST_SEG(pdesc, 1); | 722 | SET_TX_DESC_LAST_SEG(pdesc, 1); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index 4ae51d5b436f..55adf043aef7 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -476,7 +476,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
476 | break; | 476 | break; |
477 | } | 477 | } |
478 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: | 478 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: |
479 | rtl92c_set_p2p_ps_offload_cmd(hw, (*(u8 *)val)); | 479 | rtl92c_set_p2p_ps_offload_cmd(hw, *val); |
480 | break; | 480 | break; |
481 | case HW_VAR_AID:{ | 481 | case HW_VAR_AID:{ |
482 | u16 u2btmp; | 482 | u16 u2btmp; |
@@ -521,21 +521,21 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
521 | (u8 *)(&fw_current_inps)); | 521 | (u8 *)(&fw_current_inps)); |
522 | rtlpriv->cfg->ops->set_hw_reg(hw, | 522 | rtlpriv->cfg->ops->set_hw_reg(hw, |
523 | HW_VAR_H2C_FW_PWRMODE, | 523 | HW_VAR_H2C_FW_PWRMODE, |
524 | (u8 *)(&ppsc->fwctrl_psmode)); | 524 | &ppsc->fwctrl_psmode); |
525 | 525 | ||
526 | rtlpriv->cfg->ops->set_hw_reg(hw, | 526 | rtlpriv->cfg->ops->set_hw_reg(hw, |
527 | HW_VAR_SET_RPWM, | 527 | HW_VAR_SET_RPWM, |
528 | (u8 *)(&rpwm_val)); | 528 | &rpwm_val); |
529 | } else { | 529 | } else { |
530 | rpwm_val = 0x0C; /* RF on */ | 530 | rpwm_val = 0x0C; /* RF on */ |
531 | fw_pwrmode = FW_PS_ACTIVE_MODE; | 531 | fw_pwrmode = FW_PS_ACTIVE_MODE; |
532 | fw_current_inps = false; | 532 | fw_current_inps = false; |
533 | rtlpriv->cfg->ops->set_hw_reg(hw, | 533 | rtlpriv->cfg->ops->set_hw_reg(hw, |
534 | HW_VAR_SET_RPWM, | 534 | HW_VAR_SET_RPWM, |
535 | (u8 *)(&rpwm_val)); | 535 | &rpwm_val); |
536 | rtlpriv->cfg->ops->set_hw_reg(hw, | 536 | rtlpriv->cfg->ops->set_hw_reg(hw, |
537 | HW_VAR_H2C_FW_PWRMODE, | 537 | HW_VAR_H2C_FW_PWRMODE, |
538 | (u8 *)(&fw_pwrmode)); | 538 | &fw_pwrmode); |
539 | 539 | ||
540 | rtlpriv->cfg->ops->set_hw_reg(hw, | 540 | rtlpriv->cfg->ops->set_hw_reg(hw, |
541 | HW_VAR_FW_PSMODE_STATUS, | 541 | HW_VAR_FW_PSMODE_STATUS, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c index 3015af167b2b..9098558d916d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c | |||
@@ -413,20 +413,18 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
413 | (u8 *)(&fw_current_inps)); | 413 | (u8 *)(&fw_current_inps)); |
414 | rtlpriv->cfg->ops->set_hw_reg(hw, | 414 | rtlpriv->cfg->ops->set_hw_reg(hw, |
415 | HW_VAR_H2C_FW_PWRMODE, | 415 | HW_VAR_H2C_FW_PWRMODE, |
416 | (u8 *)(&ppsc->fwctrl_psmode)); | 416 | &ppsc->fwctrl_psmode); |
417 | 417 | ||
418 | rtlpriv->cfg->ops->set_hw_reg(hw, | 418 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, |
419 | HW_VAR_SET_RPWM, | 419 | &rpwm_val); |
420 | (u8 *)(&rpwm_val)); | ||
421 | } else { | 420 | } else { |
422 | rpwm_val = 0x0C; /* RF on */ | 421 | rpwm_val = 0x0C; /* RF on */ |
423 | fw_pwrmode = FW_PS_ACTIVE_MODE; | 422 | fw_pwrmode = FW_PS_ACTIVE_MODE; |
424 | fw_current_inps = false; | 423 | fw_current_inps = false; |
425 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 424 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, |
426 | (u8 *)(&rpwm_val)); | 425 | &rpwm_val); |
427 | rtlpriv->cfg->ops->set_hw_reg(hw, | 426 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
428 | HW_VAR_H2C_FW_PWRMODE, | 427 | &fw_pwrmode); |
429 | (u8 *)(&fw_pwrmode)); | ||
430 | 428 | ||
431 | rtlpriv->cfg->ops->set_hw_reg(hw, | 429 | rtlpriv->cfg->ops->set_hw_reg(hw, |
432 | HW_VAR_FW_PSMODE_STATUS, | 430 | HW_VAR_FW_PSMODE_STATUS, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c index 863ddb3e2888..25cc83058b01 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | |||
@@ -647,9 +647,8 @@ static void rtl8723ae_dm_check_edca_turbo(struct ieee80211_hw *hw) | |||
647 | } else { | 647 | } else { |
648 | if (rtlpriv->dm.current_turbo_edca) { | 648 | if (rtlpriv->dm.current_turbo_edca) { |
649 | u8 tmp = AC0_BE; | 649 | u8 tmp = AC0_BE; |
650 | rtlpriv->cfg->ops->set_hw_reg(hw, | 650 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, |
651 | HW_VAR_AC_PARAM, | 651 | &tmp); |
652 | (u8 *) (&tmp)); | ||
653 | rtlpriv->dm.current_turbo_edca = false; | 652 | rtlpriv->dm.current_turbo_edca = false; |
654 | } | 653 | } |
655 | } | 654 | } |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c index dd383b1482e9..65c9e80e1f78 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | |||
@@ -207,14 +207,13 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
207 | rtl_write_byte(rtlpriv, REG_SLOT, val[0]); | 207 | rtl_write_byte(rtlpriv, REG_SLOT, val[0]); |
208 | 208 | ||
209 | for (e_aci = 0; e_aci < AC_MAX; e_aci++) { | 209 | for (e_aci = 0; e_aci < AC_MAX; e_aci++) { |
210 | rtlpriv->cfg->ops->set_hw_reg(hw, | 210 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, |
211 | HW_VAR_AC_PARAM, | 211 | &e_aci); |
212 | (u8 *) (&e_aci)); | ||
213 | } | 212 | } |
214 | break; } | 213 | break; } |
215 | case HW_VAR_ACK_PREAMBLE:{ | 214 | case HW_VAR_ACK_PREAMBLE:{ |
216 | u8 reg_tmp; | 215 | u8 reg_tmp; |
217 | u8 short_preamble = (bool) (*(u8 *) val); | 216 | u8 short_preamble = (bool)*val; |
218 | reg_tmp = (mac->cur_40_prime_sc) << 5; | 217 | reg_tmp = (mac->cur_40_prime_sc) << 5; |
219 | if (short_preamble) | 218 | if (short_preamble) |
220 | reg_tmp |= 0x80; | 219 | reg_tmp |= 0x80; |
@@ -225,7 +224,7 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
225 | u8 min_spacing_to_set; | 224 | u8 min_spacing_to_set; |
226 | u8 sec_min_space; | 225 | u8 sec_min_space; |
227 | 226 | ||
228 | min_spacing_to_set = *((u8 *) val); | 227 | min_spacing_to_set = *val; |
229 | if (min_spacing_to_set <= 7) { | 228 | if (min_spacing_to_set <= 7) { |
230 | sec_min_space = 0; | 229 | sec_min_space = 0; |
231 | 230 | ||
@@ -249,7 +248,7 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
249 | case HW_VAR_SHORTGI_DENSITY:{ | 248 | case HW_VAR_SHORTGI_DENSITY:{ |
250 | u8 density_to_set; | 249 | u8 density_to_set; |
251 | 250 | ||
252 | density_to_set = *((u8 *) val); | 251 | density_to_set = *val; |
253 | mac->min_space_cfg |= (density_to_set << 3); | 252 | mac->min_space_cfg |= (density_to_set << 3); |
254 | 253 | ||
255 | RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, | 254 | RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, |
@@ -273,7 +272,7 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
273 | else | 272 | else |
274 | p_regtoset = regtoset_normal; | 273 | p_regtoset = regtoset_normal; |
275 | 274 | ||
276 | factor_toset = *((u8 *) val); | 275 | factor_toset = *val; |
277 | if (factor_toset <= 3) { | 276 | if (factor_toset <= 3) { |
278 | factor_toset = (1 << (factor_toset + 2)); | 277 | factor_toset = (1 << (factor_toset + 2)); |
279 | if (factor_toset > 0xf) | 278 | if (factor_toset > 0xf) |
@@ -304,16 +303,15 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
304 | } | 303 | } |
305 | break; } | 304 | break; } |
306 | case HW_VAR_AC_PARAM:{ | 305 | case HW_VAR_AC_PARAM:{ |
307 | u8 e_aci = *((u8 *) val); | 306 | u8 e_aci = *val; |
308 | rtl8723_dm_init_edca_turbo(hw); | 307 | rtl8723_dm_init_edca_turbo(hw); |
309 | 308 | ||
310 | if (rtlpci->acm_method != EACMWAY2_SW) | 309 | if (rtlpci->acm_method != EACMWAY2_SW) |
311 | rtlpriv->cfg->ops->set_hw_reg(hw, | 310 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL, |
312 | HW_VAR_ACM_CTRL, | 311 | &e_aci); |
313 | (u8 *) (&e_aci)); | ||
314 | break; } | 312 | break; } |
315 | case HW_VAR_ACM_CTRL:{ | 313 | case HW_VAR_ACM_CTRL:{ |
316 | u8 e_aci = *((u8 *) val); | 314 | u8 e_aci = *val; |
317 | union aci_aifsn *p_aci_aifsn = | 315 | union aci_aifsn *p_aci_aifsn = |
318 | (union aci_aifsn *)(&(mac->ac[0].aifs)); | 316 | (union aci_aifsn *)(&(mac->ac[0].aifs)); |
319 | u8 acm = p_aci_aifsn->f.acm; | 317 | u8 acm = p_aci_aifsn->f.acm; |
@@ -366,7 +364,7 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
366 | rtlpci->receive_config = ((u32 *) (val))[0]; | 364 | rtlpci->receive_config = ((u32 *) (val))[0]; |
367 | break; | 365 | break; |
368 | case HW_VAR_RETRY_LIMIT:{ | 366 | case HW_VAR_RETRY_LIMIT:{ |
369 | u8 retry_limit = ((u8 *) (val))[0]; | 367 | u8 retry_limit = *val; |
370 | 368 | ||
371 | rtl_write_word(rtlpriv, REG_RL, | 369 | rtl_write_word(rtlpriv, REG_RL, |
372 | retry_limit << RETRY_LIMIT_SHORT_SHIFT | | 370 | retry_limit << RETRY_LIMIT_SHORT_SHIFT | |
@@ -379,13 +377,13 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
379 | rtlefuse->efuse_usedbytes = *((u16 *) val); | 377 | rtlefuse->efuse_usedbytes = *((u16 *) val); |
380 | break; | 378 | break; |
381 | case HW_VAR_EFUSE_USAGE: | 379 | case HW_VAR_EFUSE_USAGE: |
382 | rtlefuse->efuse_usedpercentage = *((u8 *) val); | 380 | rtlefuse->efuse_usedpercentage = *val; |
383 | break; | 381 | break; |
384 | case HW_VAR_IO_CMD: | 382 | case HW_VAR_IO_CMD: |
385 | rtl8723ae_phy_set_io_cmd(hw, (*(enum io_type *)val)); | 383 | rtl8723ae_phy_set_io_cmd(hw, (*(enum io_type *)val)); |
386 | break; | 384 | break; |
387 | case HW_VAR_WPA_CONFIG: | 385 | case HW_VAR_WPA_CONFIG: |
388 | rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *) val)); | 386 | rtl_write_byte(rtlpriv, REG_SECCFG, *val); |
389 | break; | 387 | break; |
390 | case HW_VAR_SET_RPWM:{ | 388 | case HW_VAR_SET_RPWM:{ |
391 | u8 rpwm_val; | 389 | u8 rpwm_val; |
@@ -394,27 +392,25 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
394 | udelay(1); | 392 | udelay(1); |
395 | 393 | ||
396 | if (rpwm_val & BIT(7)) { | 394 | if (rpwm_val & BIT(7)) { |
397 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, | 395 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val); |
398 | (*(u8 *) val)); | ||
399 | } else { | 396 | } else { |
400 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, | 397 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val | BIT(7)); |
401 | ((*(u8 *) val) | BIT(7))); | ||
402 | } | 398 | } |
403 | 399 | ||
404 | break; } | 400 | break; } |
405 | case HW_VAR_H2C_FW_PWRMODE:{ | 401 | case HW_VAR_H2C_FW_PWRMODE:{ |
406 | u8 psmode = (*(u8 *) val); | 402 | u8 psmode = *val; |
407 | 403 | ||
408 | if (psmode != FW_PS_ACTIVE_MODE) | 404 | if (psmode != FW_PS_ACTIVE_MODE) |
409 | rtl8723ae_dm_rf_saving(hw, true); | 405 | rtl8723ae_dm_rf_saving(hw, true); |
410 | 406 | ||
411 | rtl8723ae_set_fw_pwrmode_cmd(hw, (*(u8 *) val)); | 407 | rtl8723ae_set_fw_pwrmode_cmd(hw, *val); |
412 | break; } | 408 | break; } |
413 | case HW_VAR_FW_PSMODE_STATUS: | 409 | case HW_VAR_FW_PSMODE_STATUS: |
414 | ppsc->fw_current_inpsmode = *((bool *) val); | 410 | ppsc->fw_current_inpsmode = *((bool *) val); |
415 | break; | 411 | break; |
416 | case HW_VAR_H2C_FW_JOINBSSRPT:{ | 412 | case HW_VAR_H2C_FW_JOINBSSRPT:{ |
417 | u8 mstatus = (*(u8 *) val); | 413 | u8 mstatus = *val; |
418 | u8 tmp_regcr, tmp_reg422; | 414 | u8 tmp_regcr, tmp_reg422; |
419 | bool recover = false; | 415 | bool recover = false; |
420 | 416 | ||
@@ -447,11 +443,11 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
447 | rtl_write_byte(rtlpriv, REG_CR + 1, | 443 | rtl_write_byte(rtlpriv, REG_CR + 1, |
448 | (tmp_regcr & ~(BIT(0)))); | 444 | (tmp_regcr & ~(BIT(0)))); |
449 | } | 445 | } |
450 | rtl8723ae_set_fw_joinbss_report_cmd(hw, (*(u8 *) val)); | 446 | rtl8723ae_set_fw_joinbss_report_cmd(hw, *val); |
451 | 447 | ||
452 | break; } | 448 | break; } |
453 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: | 449 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: |
454 | rtl8723ae_set_p2p_ps_offload_cmd(hw, (*(u8 *)val)); | 450 | rtl8723ae_set_p2p_ps_offload_cmd(hw, *val); |
455 | break; | 451 | break; |
456 | case HW_VAR_AID:{ | 452 | case HW_VAR_AID:{ |
457 | u16 u2btmp; | 453 | u16 u2btmp; |
@@ -461,7 +457,7 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
461 | mac->assoc_id)); | 457 | mac->assoc_id)); |
462 | break; } | 458 | break; } |
463 | case HW_VAR_CORRECT_TSF:{ | 459 | case HW_VAR_CORRECT_TSF:{ |
464 | u8 btype_ibss = ((u8 *) (val))[0]; | 460 | u8 btype_ibss = *val; |
465 | 461 | ||
466 | if (btype_ibss == true) | 462 | if (btype_ibss == true) |
467 | _rtl8723ae_stop_tx_beacon(hw); | 463 | _rtl8723ae_stop_tx_beacon(hw); |
@@ -491,20 +487,18 @@ void rtl8723ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
491 | (u8 *)(&fw_current_inps)); | 487 | (u8 *)(&fw_current_inps)); |
492 | rtlpriv->cfg->ops->set_hw_reg(hw, | 488 | rtlpriv->cfg->ops->set_hw_reg(hw, |
493 | HW_VAR_H2C_FW_PWRMODE, | 489 | HW_VAR_H2C_FW_PWRMODE, |
494 | (u8 *)(&ppsc->fwctrl_psmode)); | 490 | &ppsc->fwctrl_psmode); |
495 | 491 | ||
496 | rtlpriv->cfg->ops->set_hw_reg(hw, | 492 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, |
497 | HW_VAR_SET_RPWM, | 493 | &rpwm_val); |
498 | (u8 *)(&rpwm_val)); | ||
499 | } else { | 494 | } else { |
500 | rpwm_val = 0x0C; /* RF on */ | 495 | rpwm_val = 0x0C; /* RF on */ |
501 | fw_pwrmode = FW_PS_ACTIVE_MODE; | 496 | fw_pwrmode = FW_PS_ACTIVE_MODE; |
502 | fw_current_inps = false; | 497 | fw_current_inps = false; |
503 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 498 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, |
504 | (u8 *)(&rpwm_val)); | 499 | &rpwm_val); |
505 | rtlpriv->cfg->ops->set_hw_reg(hw, | 500 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
506 | HW_VAR_H2C_FW_PWRMODE, | 501 | &fw_pwrmode); |
507 | (u8 *)(&fw_pwrmode)); | ||
508 | 502 | ||
509 | rtlpriv->cfg->ops->set_hw_reg(hw, | 503 | rtlpriv->cfg->ops->set_hw_reg(hw, |
510 | HW_VAR_FW_PSMODE_STATUS, | 504 | HW_VAR_FW_PSMODE_STATUS, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c index 29adf55c6fd3..10b7577b6ae5 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | |||
@@ -375,7 +375,7 @@ void rtl8723ae_tx_fill_desc(struct ieee80211_hw *hw, | |||
375 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 375 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
376 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); | 376 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); |
377 | bool defaultadapter = true; | 377 | bool defaultadapter = true; |
378 | u8 *pdesc = (u8 *) pdesc_tx; | 378 | u8 *pdesc = pdesc_tx; |
379 | u16 seq_number; | 379 | u16 seq_number; |
380 | __le16 fc = hdr->frame_control; | 380 | __le16 fc = hdr->frame_control; |
381 | u8 fw_qsel = _rtl8723ae_map_hwqueue_to_fwqueue(skb, hw_queue); | 381 | u8 fw_qsel = _rtl8723ae_map_hwqueue_to_fwqueue(skb, hw_queue); |
@@ -577,7 +577,7 @@ void rtl8723ae_tx_fill_cmddesc(struct ieee80211_hw *hw, | |||
577 | 577 | ||
578 | SET_TX_DESC_OWN(pdesc, 1); | 578 | SET_TX_DESC_OWN(pdesc, 1); |
579 | 579 | ||
580 | SET_TX_DESC_PKT_SIZE((u8 *) pdesc, (u16) (skb->len)); | 580 | SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len)); |
581 | 581 | ||
582 | SET_TX_DESC_FIRST_SEG(pdesc, 1); | 582 | SET_TX_DESC_FIRST_SEG(pdesc, 1); |
583 | SET_TX_DESC_LAST_SEG(pdesc, 1); | 583 | SET_TX_DESC_LAST_SEG(pdesc, 1); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c index 736bfcb7938a..13d53a1df789 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c | |||
@@ -1083,7 +1083,7 @@ static void rtl8723be_dm_check_edca_turbo(struct ieee80211_hw *hw) | |||
1083 | if (rtlpriv->dm.current_turbo_edca) { | 1083 | if (rtlpriv->dm.current_turbo_edca) { |
1084 | u8 tmp = AC0_BE; | 1084 | u8 tmp = AC0_BE; |
1085 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, | 1085 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, |
1086 | (u8 *)(&tmp)); | 1086 | &tmp); |
1087 | } | 1087 | } |
1088 | rtlpriv->dm.current_turbo_edca = false; | 1088 | rtlpriv->dm.current_turbo_edca = false; |
1089 | } | 1089 | } |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c index 223728ddc82a..0fdf0909321f 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c | |||
@@ -147,7 +147,7 @@ static void _rtl8723be_set_fw_clock_on(struct ieee80211_hw *hw, u8 rpwm_val, | |||
147 | } | 147 | } |
148 | if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) { | 148 | if (IS_IN_LOW_POWER_STATE_88E(rtlhal->fw_ps_state)) { |
149 | rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM, | 149 | rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_SET_RPWM, |
150 | (u8 *)(&rpwm_val)); | 150 | &rpwm_val); |
151 | if (FW_PS_IS_ACK(rpwm_val)) { | 151 | if (FW_PS_IS_ACK(rpwm_val)) { |
152 | isr_regaddr = REG_HISR; | 152 | isr_regaddr = REG_HISR; |
153 | content = rtl_read_dword(rtlpriv, isr_regaddr); | 153 | content = rtl_read_dword(rtlpriv, isr_regaddr); |
@@ -221,7 +221,7 @@ static void _rtl8723be_set_fw_clock_off(struct ieee80211_hw *hw, u8 rpwm_val) | |||
221 | rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val); | 221 | rtlhal->fw_ps_state = FW_PS_STATE(rpwm_val); |
222 | rtl_write_word(rtlpriv, REG_HISR, 0x0100); | 222 | rtl_write_word(rtlpriv, REG_HISR, 0x0100); |
223 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 223 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, |
224 | (u8 *)(&rpwm_val)); | 224 | &rpwm_val); |
225 | spin_lock_bh(&rtlpriv->locks.fw_ps_lock); | 225 | spin_lock_bh(&rtlpriv->locks.fw_ps_lock); |
226 | rtlhal->fw_clk_change_in_progress = false; | 226 | rtlhal->fw_clk_change_in_progress = false; |
227 | spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); | 227 | spin_unlock_bh(&rtlpriv->locks.fw_ps_lock); |
@@ -253,15 +253,14 @@ static void _rtl8723be_fwlps_leave(struct ieee80211_hw *hw) | |||
253 | _rtl8723be_set_fw_clock_on(hw, rpwm_val, false); | 253 | _rtl8723be_set_fw_clock_on(hw, rpwm_val, false); |
254 | rtlhal->allow_sw_to_change_hwclc = false; | 254 | rtlhal->allow_sw_to_change_hwclc = false; |
255 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 255 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
256 | (u8 *)(&fw_pwrmode)); | 256 | &fw_pwrmode); |
257 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 257 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
258 | (u8 *)(&fw_current_inps)); | 258 | (u8 *)(&fw_current_inps)); |
259 | } else { | 259 | } else { |
260 | rpwm_val = FW_PS_STATE_ALL_ON_88E; /* RF on */ | 260 | rpwm_val = FW_PS_STATE_ALL_ON_88E; /* RF on */ |
261 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 261 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val); |
262 | (u8 *)(&rpwm_val)); | ||
263 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 262 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
264 | (u8 *)(&fw_pwrmode)); | 263 | &fw_pwrmode); |
265 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 264 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
266 | (u8 *)(&fw_current_inps)); | 265 | (u8 *)(&fw_current_inps)); |
267 | } | 266 | } |
@@ -280,7 +279,7 @@ static void _rtl8723be_fwlps_enter(struct ieee80211_hw *hw) | |||
280 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 279 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
281 | (u8 *)(&fw_current_inps)); | 280 | (u8 *)(&fw_current_inps)); |
282 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 281 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
283 | (u8 *)(&ppsc->fwctrl_psmode)); | 282 | &ppsc->fwctrl_psmode); |
284 | rtlhal->allow_sw_to_change_hwclc = true; | 283 | rtlhal->allow_sw_to_change_hwclc = true; |
285 | _rtl8723be_set_fw_clock_off(hw, rpwm_val); | 284 | _rtl8723be_set_fw_clock_off(hw, rpwm_val); |
286 | 285 | ||
@@ -289,9 +288,8 @@ static void _rtl8723be_fwlps_enter(struct ieee80211_hw *hw) | |||
289 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, | 288 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS, |
290 | (u8 *)(&fw_current_inps)); | 289 | (u8 *)(&fw_current_inps)); |
291 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, | 290 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE, |
292 | (u8 *)(&ppsc->fwctrl_psmode)); | 291 | &ppsc->fwctrl_psmode); |
293 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, | 292 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM, &rpwm_val); |
294 | (u8 *)(&rpwm_val)); | ||
295 | } | 293 | } |
296 | } | 294 | } |
297 | 295 | ||
@@ -400,12 +398,12 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
400 | 398 | ||
401 | for (e_aci = 0; e_aci < AC_MAX; e_aci++) { | 399 | for (e_aci = 0; e_aci < AC_MAX; e_aci++) { |
402 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, | 400 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, |
403 | (u8 *)(&e_aci)); | 401 | &e_aci); |
404 | } | 402 | } |
405 | break; } | 403 | break; } |
406 | case HW_VAR_ACK_PREAMBLE: { | 404 | case HW_VAR_ACK_PREAMBLE: { |
407 | u8 reg_tmp; | 405 | u8 reg_tmp; |
408 | u8 short_preamble = (bool) (*(u8 *)val); | 406 | u8 short_preamble = (bool)*val; |
409 | reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL + 2); | 407 | reg_tmp = rtl_read_byte(rtlpriv, REG_TRXPTCL_CTL + 2); |
410 | if (short_preamble) { | 408 | if (short_preamble) { |
411 | reg_tmp |= 0x02; | 409 | reg_tmp |= 0x02; |
@@ -416,13 +414,13 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
416 | } | 414 | } |
417 | break; } | 415 | break; } |
418 | case HW_VAR_WPA_CONFIG: | 416 | case HW_VAR_WPA_CONFIG: |
419 | rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val)); | 417 | rtl_write_byte(rtlpriv, REG_SECCFG, *val); |
420 | break; | 418 | break; |
421 | case HW_VAR_AMPDU_MIN_SPACE: { | 419 | case HW_VAR_AMPDU_MIN_SPACE: { |
422 | u8 min_spacing_to_set; | 420 | u8 min_spacing_to_set; |
423 | u8 sec_min_space; | 421 | u8 sec_min_space; |
424 | 422 | ||
425 | min_spacing_to_set = *((u8 *)val); | 423 | min_spacing_to_set = *val; |
426 | if (min_spacing_to_set <= 7) { | 424 | if (min_spacing_to_set <= 7) { |
427 | sec_min_space = 0; | 425 | sec_min_space = 0; |
428 | 426 | ||
@@ -445,7 +443,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
445 | case HW_VAR_SHORTGI_DENSITY: { | 443 | case HW_VAR_SHORTGI_DENSITY: { |
446 | u8 density_to_set; | 444 | u8 density_to_set; |
447 | 445 | ||
448 | density_to_set = *((u8 *)val); | 446 | density_to_set = *val; |
449 | mac->min_space_cfg |= (density_to_set << 3); | 447 | mac->min_space_cfg |= (density_to_set << 3); |
450 | 448 | ||
451 | RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, | 449 | RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, |
@@ -463,7 +461,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
463 | 461 | ||
464 | p_regtoset = regtoset_normal; | 462 | p_regtoset = regtoset_normal; |
465 | 463 | ||
466 | factor_toset = *((u8 *)val); | 464 | factor_toset = *val; |
467 | if (factor_toset <= 3) { | 465 | if (factor_toset <= 3) { |
468 | factor_toset = (1 << (factor_toset + 2)); | 466 | factor_toset = (1 << (factor_toset + 2)); |
469 | if (factor_toset > 0xf) | 467 | if (factor_toset > 0xf) |
@@ -491,15 +489,15 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
491 | } | 489 | } |
492 | break; } | 490 | break; } |
493 | case HW_VAR_AC_PARAM: { | 491 | case HW_VAR_AC_PARAM: { |
494 | u8 e_aci = *((u8 *)val); | 492 | u8 e_aci = *val; |
495 | rtl8723_dm_init_edca_turbo(hw); | 493 | rtl8723_dm_init_edca_turbo(hw); |
496 | 494 | ||
497 | if (rtlpci->acm_method != EACMWAY2_SW) | 495 | if (rtlpci->acm_method != EACMWAY2_SW) |
498 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL, | 496 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL, |
499 | (u8 *)(&e_aci)); | 497 | &e_aci); |
500 | break; } | 498 | break; } |
501 | case HW_VAR_ACM_CTRL: { | 499 | case HW_VAR_ACM_CTRL: { |
502 | u8 e_aci = *((u8 *)val); | 500 | u8 e_aci = *val; |
503 | union aci_aifsn *p_aci_aifsn = | 501 | union aci_aifsn *p_aci_aifsn = |
504 | (union aci_aifsn *)(&(mac->ac[0].aifs)); | 502 | (union aci_aifsn *)(&(mac->ac[0].aifs)); |
505 | u8 acm = p_aci_aifsn->f.acm; | 503 | u8 acm = p_aci_aifsn->f.acm; |
@@ -552,7 +550,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
552 | rtlpci->receive_config = ((u32 *)(val))[0]; | 550 | rtlpci->receive_config = ((u32 *)(val))[0]; |
553 | break; | 551 | break; |
554 | case HW_VAR_RETRY_LIMIT: { | 552 | case HW_VAR_RETRY_LIMIT: { |
555 | u8 retry_limit = ((u8 *)(val))[0]; | 553 | u8 retry_limit = *val; |
556 | 554 | ||
557 | rtl_write_word(rtlpriv, REG_RL, | 555 | rtl_write_word(rtlpriv, REG_RL, |
558 | retry_limit << RETRY_LIMIT_SHORT_SHIFT | | 556 | retry_limit << RETRY_LIMIT_SHORT_SHIFT | |
@@ -565,7 +563,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
565 | rtlefuse->efuse_usedbytes = *((u16 *)val); | 563 | rtlefuse->efuse_usedbytes = *((u16 *)val); |
566 | break; | 564 | break; |
567 | case HW_VAR_EFUSE_USAGE: | 565 | case HW_VAR_EFUSE_USAGE: |
568 | rtlefuse->efuse_usedpercentage = *((u8 *)val); | 566 | rtlefuse->efuse_usedpercentage = *val; |
569 | break; | 567 | break; |
570 | case HW_VAR_IO_CMD: | 568 | case HW_VAR_IO_CMD: |
571 | rtl8723be_phy_set_io_cmd(hw, (*(enum io_type *)val)); | 569 | rtl8723be_phy_set_io_cmd(hw, (*(enum io_type *)val)); |
@@ -577,14 +575,13 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
577 | udelay(1); | 575 | udelay(1); |
578 | 576 | ||
579 | if (rpwm_val & BIT(7)) { | 577 | if (rpwm_val & BIT(7)) { |
580 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, (*(u8 *)val)); | 578 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val); |
581 | } else { | 579 | } else { |
582 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, | 580 | rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val | BIT(7)); |
583 | ((*(u8 *)val) | BIT(7))); | ||
584 | } | 581 | } |
585 | break; } | 582 | break; } |
586 | case HW_VAR_H2C_FW_PWRMODE: | 583 | case HW_VAR_H2C_FW_PWRMODE: |
587 | rtl8723be_set_fw_pwrmode_cmd(hw, (*(u8 *)val)); | 584 | rtl8723be_set_fw_pwrmode_cmd(hw, *val); |
588 | break; | 585 | break; |
589 | case HW_VAR_FW_PSMODE_STATUS: | 586 | case HW_VAR_FW_PSMODE_STATUS: |
590 | ppsc->fw_current_inpsmode = *((bool *)val); | 587 | ppsc->fw_current_inpsmode = *((bool *)val); |
@@ -602,7 +599,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
602 | 599 | ||
603 | break; } | 600 | break; } |
604 | case HW_VAR_H2C_FW_JOINBSSRPT: { | 601 | case HW_VAR_H2C_FW_JOINBSSRPT: { |
605 | u8 mstatus = (*(u8 *)val); | 602 | u8 mstatus = *val; |
606 | u8 tmp_regcr, tmp_reg422, bcnvalid_reg; | 603 | u8 tmp_regcr, tmp_reg422, bcnvalid_reg; |
607 | u8 count = 0, dlbcn_count = 0; | 604 | u8 count = 0, dlbcn_count = 0; |
608 | bool recover = false; | 605 | bool recover = false; |
@@ -657,10 +654,10 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
657 | rtl_write_byte(rtlpriv, REG_CR + 1, | 654 | rtl_write_byte(rtlpriv, REG_CR + 1, |
658 | (tmp_regcr & ~(BIT(0)))); | 655 | (tmp_regcr & ~(BIT(0)))); |
659 | } | 656 | } |
660 | rtl8723be_set_fw_joinbss_report_cmd(hw, (*(u8 *)val)); | 657 | rtl8723be_set_fw_joinbss_report_cmd(hw, *val); |
661 | break; } | 658 | break; } |
662 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: | 659 | case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: |
663 | rtl8723be_set_p2p_ps_offload_cmd(hw, (*(u8 *)val)); | 660 | rtl8723be_set_p2p_ps_offload_cmd(hw, *val); |
664 | break; | 661 | break; |
665 | case HW_VAR_AID: { | 662 | case HW_VAR_AID: { |
666 | u16 u2btmp; | 663 | u16 u2btmp; |
@@ -670,7 +667,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
670 | (u2btmp | mac->assoc_id)); | 667 | (u2btmp | mac->assoc_id)); |
671 | break; } | 668 | break; } |
672 | case HW_VAR_CORRECT_TSF: { | 669 | case HW_VAR_CORRECT_TSF: { |
673 | u8 btype_ibss = ((u8 *)(val))[0]; | 670 | u8 btype_ibss = *val; |
674 | 671 | ||
675 | if (btype_ibss) | 672 | if (btype_ibss) |
676 | _rtl8723be_stop_tx_beacon(hw); | 673 | _rtl8723be_stop_tx_beacon(hw); |
@@ -690,7 +687,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
690 | case HW_VAR_KEEP_ALIVE: { | 687 | case HW_VAR_KEEP_ALIVE: { |
691 | u8 array[2]; | 688 | u8 array[2]; |
692 | array[0] = 0xff; | 689 | array[0] = 0xff; |
693 | array[1] = *((u8 *)val); | 690 | array[1] = *val; |
694 | rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_KEEP_ALIVE_CTRL, | 691 | rtl8723be_fill_h2c_cmd(hw, H2C_8723BE_KEEP_ALIVE_CTRL, |
695 | 2, array); | 692 | 2, array); |
696 | break; } | 693 | break; } |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/rtlwifi/rtl8723be/trx.c index 74a75dceab08..e0a0d8c8fed5 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/trx.c | |||
@@ -647,7 +647,7 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw, | |||
647 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 647 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
648 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 648 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
649 | struct rtl_hal *rtlhal = rtl_hal(rtlpriv); | 649 | struct rtl_hal *rtlhal = rtl_hal(rtlpriv); |
650 | u8 *pdesc = (u8 *)pdesc_tx; | 650 | u8 *pdesc = pdesc_tx; |
651 | u16 seq_number; | 651 | u16 seq_number; |
652 | __le16 fc = hdr->frame_control; | 652 | __le16 fc = hdr->frame_control; |
653 | unsigned int buf_len = 0; | 653 | unsigned int buf_len = 0; |
@@ -850,7 +850,7 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, | |||
850 | 850 | ||
851 | SET_TX_DESC_OWN(pdesc, 1); | 851 | SET_TX_DESC_OWN(pdesc, 1); |
852 | 852 | ||
853 | SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len)); | 853 | SET_TX_DESC_PKT_SIZE(pdesc, (u16)(skb->len)); |
854 | 854 | ||
855 | SET_TX_DESC_FIRST_SEG(pdesc, 1); | 855 | SET_TX_DESC_FIRST_SEG(pdesc, 1); |
856 | SET_TX_DESC_LAST_SEG(pdesc, 1); | 856 | SET_TX_DESC_LAST_SEG(pdesc, 1); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c index c12da552b7f7..540278ff462b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c | |||
@@ -115,7 +115,7 @@ void rtl8723_write_fw(struct ieee80211_hw *hw, | |||
115 | u8 *buffer, u32 size) | 115 | u8 *buffer, u32 size) |
116 | { | 116 | { |
117 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 117 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
118 | u8 *bufferptr = (u8 *)buffer; | 118 | u8 *bufferptr = buffer; |
119 | u32 pagenums, remainsize; | 119 | u32 pagenums, remainsize; |
120 | u32 page, offset; | 120 | u32 page, offset; |
121 | 121 | ||
@@ -257,7 +257,7 @@ int rtl8723_download_fw(struct ieee80211_hw *hw, | |||
257 | return 1; | 257 | return 1; |
258 | 258 | ||
259 | pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware; | 259 | pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware; |
260 | pfwdata = (u8 *)rtlhal->pfirmware; | 260 | pfwdata = rtlhal->pfirmware; |
261 | fwsize = rtlhal->fwsize; | 261 | fwsize = rtlhal->fwsize; |
262 | RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, | 262 | RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, |
263 | "normal Firmware SIZE %d\n", fwsize); | 263 | "normal Firmware SIZE %d\n", fwsize); |