diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-05-22 21:54:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-01 15:12:29 -0400 |
commit | 6c0d4988c7dc23e5e8b22e99ab140e47c716848e (patch) | |
tree | 742b8c7cb1fa14b363727c42c7c67f567699442e /drivers/net | |
parent | c0fda68d00a72895c4ad0871c6f57074b0e4292c (diff) |
rtl8192ce: Fix warnings from gcc 4.6.0
gcc 4.6.0 warnings for rtl8192ce:
CC [M] drivers/net/wireless/rtlwifi/rtl8192ce/hw.o
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c: In function ‘_rtl92ce_hw_configure’:
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c:766:6: warning: variable ‘reg_ratr’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c: In function ‘rtl92ce_gpio_radio_on_off_checking’:
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c:1972:41: warning: variable ‘cur_rfstate’ set but not used [-Wunused-but-set-variable]
CC [M] drivers/net/wireless/rtlwifi/rtl8192ce/phy.o
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c: In function ‘rtl92c_phy_config_rf_with_headerfile’:
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:284:7: warning: variable ‘rtstatus’ set but not used [-Wunused-but-set-variable]
CC [M] drivers/net/wireless/rtlwifi/rtl8192ce/trx.o
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c: In function ‘_rtl92ce_translate_rx_signal_stuff’:
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c:595:6: warning: variable ‘psaddr’ set but not used [-Wunused-but-set-variable]
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index defb4370cf74..d5d3c8a572c7 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -763,11 +763,9 @@ static void _rtl92ce_hw_configure(struct ieee80211_hw *hw) | |||
763 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 763 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
764 | struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw); | 764 | struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw); |
765 | u8 reg_bw_opmode; | 765 | u8 reg_bw_opmode; |
766 | u32 reg_ratr, reg_prsr; | 766 | u32 reg_prsr; |
767 | 767 | ||
768 | reg_bw_opmode = BW_OPMODE_20MHZ; | 768 | reg_bw_opmode = BW_OPMODE_20MHZ; |
769 | reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG | | ||
770 | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS; | ||
771 | reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG; | 769 | reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG; |
772 | 770 | ||
773 | rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8); | 771 | rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8); |
@@ -1969,7 +1967,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) | |||
1969 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1967 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
1970 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); | 1968 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); |
1971 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 1969 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
1972 | enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate; | 1970 | enum rf_pwrstate e_rfpowerstate_toset; |
1973 | u8 u1tmp; | 1971 | u8 u1tmp; |
1974 | bool actuallyset = false; | 1972 | bool actuallyset = false; |
1975 | unsigned long flag; | 1973 | unsigned long flag; |
@@ -1989,8 +1987,6 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) | |||
1989 | spin_unlock_irqrestore(&rtlpriv->locks.rf_ps_lock, flag); | 1987 | spin_unlock_irqrestore(&rtlpriv->locks.rf_ps_lock, flag); |
1990 | } | 1988 | } |
1991 | 1989 | ||
1992 | cur_rfstate = ppsc->rfpwr_state; | ||
1993 | |||
1994 | rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, rtl_read_byte(rtlpriv, | 1990 | rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, rtl_read_byte(rtlpriv, |
1995 | REG_MAC_PINMUX_CFG)&~(BIT(3))); | 1991 | REG_MAC_PINMUX_CFG)&~(BIT(3))); |
1996 | 1992 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c index abe0fcc75368..c5be547ad710 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | |||
@@ -281,7 +281,6 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, | |||
281 | { | 281 | { |
282 | 282 | ||
283 | int i; | 283 | int i; |
284 | bool rtstatus = true; | ||
285 | u32 *radioa_array_table; | 284 | u32 *radioa_array_table; |
286 | u32 *radiob_array_table; | 285 | u32 *radiob_array_table; |
287 | u16 radioa_arraylen, radiob_arraylen; | 286 | u16 radioa_arraylen, radiob_arraylen; |
@@ -308,7 +307,6 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, | |||
308 | ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n")); | 307 | ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n")); |
309 | } | 308 | } |
310 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath)); | 309 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath)); |
311 | rtstatus = true; | ||
312 | switch (rfpath) { | 310 | switch (rfpath) { |
313 | case RF90_PATH_A: | 311 | case RF90_PATH_A: |
314 | for (i = 0; i < radioa_arraylen; i = i + 2) { | 312 | for (i = 0; i < radioa_arraylen; i = i + 2) { |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c index 54b2bd53d36a..ac95dc44374d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | |||
@@ -592,7 +592,6 @@ static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
592 | struct ieee80211_hdr *hdr; | 592 | struct ieee80211_hdr *hdr; |
593 | u8 *tmp_buf; | 593 | u8 *tmp_buf; |
594 | u8 *praddr; | 594 | u8 *praddr; |
595 | u8 *psaddr; | ||
596 | __le16 fc; | 595 | __le16 fc; |
597 | u16 type, c_fc; | 596 | u16 type, c_fc; |
598 | bool packet_matchbssid, packet_toself, packet_beacon; | 597 | bool packet_matchbssid, packet_toself, packet_beacon; |
@@ -604,7 +603,6 @@ static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
604 | c_fc = le16_to_cpu(fc); | 603 | c_fc = le16_to_cpu(fc); |
605 | type = WLAN_FC_GET_TYPE(fc); | 604 | type = WLAN_FC_GET_TYPE(fc); |
606 | praddr = hdr->addr1; | 605 | praddr = hdr->addr1; |
607 | psaddr = hdr->addr2; | ||
608 | 606 | ||
609 | packet_matchbssid = | 607 | packet_matchbssid = |
610 | ((IEEE80211_FTYPE_CTL != type) && | 608 | ((IEEE80211_FTYPE_CTL != type) && |