diff options
author | Joe Perches <joe@perches.com> | 2012-06-04 08:44:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-06 12:31:33 -0400 |
commit | 2c208890c6d4e16076c6664137703ec813e8fa6c (patch) | |
tree | dd25049d7fdaf305679acc08f4b36fbcdbdb0213 /drivers/net/wireless/rtlwifi/core.c | |
parent | 6469933605a3ecdfa66b98160cde98ecd256cb3f (diff) |
wireless: Remove casts to same type
Adding casts of objects to the same type is unnecessary
and confusing for a human reader.
For example, this cast:
int y;
int *p = (int *)&y;
I used the coccinelle script below to find and remove these
unnecessary casts. I manually removed the conversions this
script produces of casts with __force, __iomem and __user.
@@
type T;
T *p;
@@
- (T *)p
+ p
Neatened the mwifiex_deauthenticate_infra function which
was doing odd things with array pointers and not using
is_zero_ether_addr.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/core.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index 278e9f957e0d..a18ad2a98938 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c | |||
@@ -680,7 +680,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
680 | 680 | ||
681 | mac->short_preamble = bss_conf->use_short_preamble; | 681 | mac->short_preamble = bss_conf->use_short_preamble; |
682 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE, | 682 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE, |
683 | (u8 *) (&mac->short_preamble)); | 683 | &mac->short_preamble); |
684 | } | 684 | } |
685 | 685 | ||
686 | if (changed & BSS_CHANGED_ERP_SLOT) { | 686 | if (changed & BSS_CHANGED_ERP_SLOT) { |
@@ -693,7 +693,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
693 | mac->slot_time = RTL_SLOT_TIME_20; | 693 | mac->slot_time = RTL_SLOT_TIME_20; |
694 | 694 | ||
695 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, | 695 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME, |
696 | (u8 *) (&mac->slot_time)); | 696 | &mac->slot_time); |
697 | } | 697 | } |
698 | 698 | ||
699 | if (changed & BSS_CHANGED_HT) { | 699 | if (changed & BSS_CHANGED_HT) { |
@@ -713,7 +713,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
713 | rcu_read_unlock(); | 713 | rcu_read_unlock(); |
714 | 714 | ||
715 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SHORTGI_DENSITY, | 715 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SHORTGI_DENSITY, |
716 | (u8 *) (&mac->max_mss_density)); | 716 | &mac->max_mss_density); |
717 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_FACTOR, | 717 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_FACTOR, |
718 | &mac->current_ampdu_factor); | 718 | &mac->current_ampdu_factor); |
719 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_MIN_SPACE, | 719 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_MIN_SPACE, |
@@ -801,7 +801,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
801 | u8 mstatus = RT_MEDIA_CONNECT; | 801 | u8 mstatus = RT_MEDIA_CONNECT; |
802 | rtlpriv->cfg->ops->set_hw_reg(hw, | 802 | rtlpriv->cfg->ops->set_hw_reg(hw, |
803 | HW_VAR_H2C_FW_JOINBSSRPT, | 803 | HW_VAR_H2C_FW_JOINBSSRPT, |
804 | (u8 *) (&mstatus)); | 804 | &mstatus); |
805 | ppsc->report_linked = true; | 805 | ppsc->report_linked = true; |
806 | } | 806 | } |
807 | } else { | 807 | } else { |
@@ -809,7 +809,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
809 | u8 mstatus = RT_MEDIA_DISCONNECT; | 809 | u8 mstatus = RT_MEDIA_DISCONNECT; |
810 | rtlpriv->cfg->ops->set_hw_reg(hw, | 810 | rtlpriv->cfg->ops->set_hw_reg(hw, |
811 | HW_VAR_H2C_FW_JOINBSSRPT, | 811 | HW_VAR_H2C_FW_JOINBSSRPT, |
812 | (u8 *)(&mstatus)); | 812 | &mstatus); |
813 | ppsc->report_linked = false; | 813 | ppsc->report_linked = false; |
814 | } | 814 | } |
815 | } | 815 | } |
@@ -836,7 +836,7 @@ static void rtl_op_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
836 | u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0; | 836 | u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0; |
837 | 837 | ||
838 | mac->tsf = tsf; | 838 | mac->tsf = tsf; |
839 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss)); | 839 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, &bibss); |
840 | } | 840 | } |
841 | 841 | ||
842 | static void rtl_op_reset_tsf(struct ieee80211_hw *hw, | 842 | static void rtl_op_reset_tsf(struct ieee80211_hw *hw, |
@@ -845,7 +845,7 @@ static void rtl_op_reset_tsf(struct ieee80211_hw *hw, | |||
845 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 845 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
846 | u8 tmp = 0; | 846 | u8 tmp = 0; |
847 | 847 | ||
848 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, (u8 *) (&tmp)); | 848 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, &tmp); |
849 | } | 849 | } |
850 | 850 | ||
851 | static void rtl_op_sta_notify(struct ieee80211_hw *hw, | 851 | static void rtl_op_sta_notify(struct ieee80211_hw *hw, |