Commit 78d57372 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville

rtl8192se: Fix warnings from gcc 4.6.0

gcc 4.6.0 warnings for rtl8192se:

  CC [M]  drivers/net/wireless/rtlwifi/rtl8192se/dm.o
drivers/net/wireless/rtlwifi/rtl8192se/dm.c: In function ‘_rtl92s_dm_refresh_rateadaptive_mask’:
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:225:5: warning: variable ‘rssi_level’ set but not used [-Wunused-but-set-variable]
  CC [M]  drivers/net/wireless/rtlwifi/rtl8192se/fw.o
drivers/net/wireless/rtlwifi/rtl8192se/fw.c: In function ‘rtl92s_download_fw’:
drivers/net/wireless/rtlwifi/rtl8192se/fw.c:361:6: warning: variable ‘file_length’ set but not used [-Wunused-but-set-variable]
  CC [M]  drivers/net/wireless/rtlwifi/rtl8192se/hw.o
drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function ‘_rtl92se_hw_configure’:
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:887:6: warning: variable ‘reg_ratr’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function ‘_rtl92se_set_media_status’:
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:1125:20: warning: variable ‘ledaction’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function ‘rtl92se_gpio_radio_on_off_checking’:
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:2274:32: warning: variable ‘cur_rfstate’ set but not used [-Wunused-but-set-variable]
  CC [M]  drivers/net/wireless/rtlwifi/rtl8192se/phy.o
drivers/net/wireless/rtlwifi/rtl8192se/phy.c: In function ‘rtl92s_phy_set_bw_mode’:
drivers/net/wireless/rtlwifi/rtl8192se/phy.c:266:5: warning: variable ‘reg_prsr_rsc’ set but not used [-Wunused-but-set-variable]
  CC [M]  drivers/net/wireless/rtlwifi/rtl8192se/trx.o
drivers/net/wireless/rtlwifi/rtl8192se/trx.c: In function ‘_rtl92se_translate_rx_signal_stuff’:
drivers/net/wireless/rtlwifi/rtl8192se/trx.c:584:6: warning: variable ‘psaddr’ set but not used [-Wunused-but-set-variable]
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 52722592
...@@ -222,7 +222,6 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw) ...@@ -222,7 +222,6 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
u32 low_rssi_thresh = 0; u32 low_rssi_thresh = 0;
u32 middle_rssi_thresh = 0; u32 middle_rssi_thresh = 0;
u32 high_rssi_thresh = 0; u32 high_rssi_thresh = 0;
u8 rssi_level;
struct ieee80211_sta *sta = NULL; struct ieee80211_sta *sta = NULL;
if (is_hal_stop(rtlhal)) if (is_hal_stop(rtlhal))
...@@ -272,18 +271,14 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw) ...@@ -272,18 +271,14 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
if (rtlpriv->dm.undecorated_smoothed_pwdb > if (rtlpriv->dm.undecorated_smoothed_pwdb >
(long)high_rssi_thresh) { (long)high_rssi_thresh) {
ra->ratr_state = DM_RATR_STA_HIGH; ra->ratr_state = DM_RATR_STA_HIGH;
rssi_level = 1;
} else if (rtlpriv->dm.undecorated_smoothed_pwdb > } else if (rtlpriv->dm.undecorated_smoothed_pwdb >
(long)middle_rssi_thresh) { (long)middle_rssi_thresh) {
ra->ratr_state = DM_RATR_STA_LOW; ra->ratr_state = DM_RATR_STA_LOW;
rssi_level = 3;
} else if (rtlpriv->dm.undecorated_smoothed_pwdb > } else if (rtlpriv->dm.undecorated_smoothed_pwdb >
(long)low_rssi_thresh) { (long)low_rssi_thresh) {
ra->ratr_state = DM_RATR_STA_LOW; ra->ratr_state = DM_RATR_STA_LOW;
rssi_level = 5;
} else { } else {
ra->ratr_state = DM_RATR_STA_ULTRALOW; ra->ratr_state = DM_RATR_STA_ULTRALOW;
rssi_level = 6;
} }
if (ra->pre_ratr_state != ra->ratr_state) { if (ra->pre_ratr_state != ra->ratr_state) {
......
...@@ -358,7 +358,6 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) ...@@ -358,7 +358,6 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
struct fw_priv *pfw_priv = NULL; struct fw_priv *pfw_priv = NULL;
u8 *puc_mappedfile = NULL; u8 *puc_mappedfile = NULL;
u32 ul_filelength = 0; u32 ul_filelength = 0;
u32 file_length = 0;
u8 fwhdr_size = RT_8192S_FIRMWARE_HDR_SIZE; u8 fwhdr_size = RT_8192S_FIRMWARE_HDR_SIZE;
u8 fwstatus = FW_STATUS_INIT; u8 fwstatus = FW_STATUS_INIT;
bool rtstatus = true; bool rtstatus = true;
...@@ -370,7 +369,6 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) ...@@ -370,7 +369,6 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
firmware->fwstatus = FW_STATUS_INIT; firmware->fwstatus = FW_STATUS_INIT;
puc_mappedfile = firmware->sz_fw_tmpbuffer; puc_mappedfile = firmware->sz_fw_tmpbuffer;
file_length = firmware->sz_fw_tmpbufferlen;
/* 1. Retrieve FW header. */ /* 1. Retrieve FW header. */
firmware->pfwheader = (struct fw_hdr *) puc_mappedfile; firmware->pfwheader = (struct fw_hdr *) puc_mappedfile;
......
...@@ -884,12 +884,10 @@ static void _rtl92se_hw_configure(struct ieee80211_hw *hw) ...@@ -884,12 +884,10 @@ static void _rtl92se_hw_configure(struct ieee80211_hw *hw)
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
u8 reg_bw_opmode = 0; u8 reg_bw_opmode = 0;
u32 reg_ratr = 0, reg_rrsr = 0; u32 reg_rrsr = 0;
u8 regtmp = 0; u8 regtmp = 0;
reg_bw_opmode = BW_OPMODE_20MHZ; reg_bw_opmode = BW_OPMODE_20MHZ;
reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS |
RATE_ALL_OFDM_2SS;
reg_rrsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG; reg_rrsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
regtmp = rtl_read_byte(rtlpriv, INIRTSMCS_SEL); regtmp = rtl_read_byte(rtlpriv, INIRTSMCS_SEL);
...@@ -1122,14 +1120,12 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw, ...@@ -1122,14 +1120,12 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw,
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
u8 bt_msr = rtl_read_byte(rtlpriv, MSR); u8 bt_msr = rtl_read_byte(rtlpriv, MSR);
enum led_ctl_mode ledaction = LED_CTL_NO_LINK;
u32 temp; u32 temp;
bt_msr &= ~MSR_LINK_MASK; bt_msr &= ~MSR_LINK_MASK;
switch (type) { switch (type) {
case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_UNSPECIFIED:
bt_msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT); bt_msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT);
ledaction = LED_CTL_LINK;
RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
("Set Network type to NO LINK!\n")); ("Set Network type to NO LINK!\n"));
break; break;
...@@ -1140,7 +1136,6 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw, ...@@ -1140,7 +1136,6 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw,
break; break;
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
bt_msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT); bt_msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT);
ledaction = LED_CTL_LINK;
RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
("Set Network type to STA!\n")); ("Set Network type to STA!\n"));
break; break;
...@@ -2271,7 +2266,7 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) ...@@ -2271,7 +2266,7 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
enum rf_pwrstate rfpwr_toset, cur_rfstate; enum rf_pwrstate rfpwr_toset /*, cur_rfstate */;
unsigned long flag = 0; unsigned long flag = 0;
bool actuallyset = false; bool actuallyset = false;
bool turnonbypowerdomain = false; bool turnonbypowerdomain = false;
...@@ -2292,7 +2287,7 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) ...@@ -2292,7 +2287,7 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
spin_unlock_irqrestore(&rtlpriv->locks.rf_ps_lock, flag); spin_unlock_irqrestore(&rtlpriv->locks.rf_ps_lock, flag);
} }
cur_rfstate = ppsc->rfpwr_state; /* cur_rfstate = ppsc->rfpwr_state;*/
/* because after _rtl92s_phy_set_rfhalt, all power /* because after _rtl92s_phy_set_rfhalt, all power
* closed, so we must open some power for GPIO check, * closed, so we must open some power for GPIO check,
......
...@@ -263,7 +263,6 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw, ...@@ -263,7 +263,6 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
u8 reg_bw_opmode; u8 reg_bw_opmode;
u8 reg_prsr_rsc;
RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("Switch to %s bandwidth\n", RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("Switch to %s bandwidth\n",
rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ? rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
...@@ -277,7 +276,8 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw, ...@@ -277,7 +276,8 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
rtlphy->set_bwmode_inprogress = true; rtlphy->set_bwmode_inprogress = true;
reg_bw_opmode = rtl_read_byte(rtlpriv, BW_OPMODE); reg_bw_opmode = rtl_read_byte(rtlpriv, BW_OPMODE);
reg_prsr_rsc = rtl_read_byte(rtlpriv, RRSR + 2); /* dummy read */
rtl_read_byte(rtlpriv, RRSR + 2);
switch (rtlphy->current_chan_bw) { switch (rtlphy->current_chan_bw) {
case HT_CHANNEL_WIDTH_20: case HT_CHANNEL_WIDTH_20:
......
...@@ -581,7 +581,6 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw, ...@@ -581,7 +581,6 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
u8 *tmp_buf; u8 *tmp_buf;
u8 *praddr; u8 *praddr;
u8 *psaddr;
__le16 fc; __le16 fc;
u16 type, cfc; u16 type, cfc;
bool packet_matchbssid, packet_toself, packet_beacon; bool packet_matchbssid, packet_toself, packet_beacon;
...@@ -593,7 +592,6 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw, ...@@ -593,7 +592,6 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
cfc = le16_to_cpu(fc); cfc = le16_to_cpu(fc);
type = WLAN_FC_GET_TYPE(fc); type = WLAN_FC_GET_TYPE(fc);
praddr = hdr->addr1; praddr = hdr->addr1;
psaddr = hdr->addr2;
packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) && packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
(!compare_ether_addr(mac->bssid, (cfc & IEEE80211_FCTL_TODS) ? (!compare_ether_addr(mac->bssid, (cfc & IEEE80211_FCTL_TODS) ?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment