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

rtlwifi: Remove unused/unneeded variables

Remove some unused variables and correct spelling errors.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6d2bd916
...@@ -432,7 +432,7 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw, ...@@ -432,7 +432,7 @@ static void _rtl_txrate_selectmode(struct ieee80211_hw *hw,
} }
if (rtlpriv->dm.useramask) { if (rtlpriv->dm.useramask) {
/* TODO we will differentiate adhoc and station futrue */ /* TODO adhoc and station handled differently in the future */
tcb_desc->mac_id = 0; tcb_desc->mac_id = 0;
if ((mac->mode == WIRELESS_MODE_N_24G) || if ((mac->mode == WIRELESS_MODE_N_24G) ||
...@@ -630,7 +630,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) ...@@ -630,7 +630,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
const struct iphdr *ip; const struct iphdr *ip;
if (!ieee80211_is_data(fc)) if (!ieee80211_is_data(fc))
goto end; return false;
if (ieee80211_is_nullfunc(fc)) if (ieee80211_is_nullfunc(fc))
return true; return true;
...@@ -686,7 +686,6 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) ...@@ -686,7 +686,6 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
return true; return true;
} }
end:
return false; return false;
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/*mutex for start & stop is must here. */ /*mutex for start & stop is must here. */
static int rtl_op_start(struct ieee80211_hw *hw) static int rtl_op_start(struct ieee80211_hw *hw)
{ {
int err = 0; int err;
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
...@@ -45,10 +45,8 @@ static int rtl_op_start(struct ieee80211_hw *hw) ...@@ -45,10 +45,8 @@ static int rtl_op_start(struct ieee80211_hw *hw)
return 0; return 0;
mutex_lock(&rtlpriv->locks.conf_mutex); mutex_lock(&rtlpriv->locks.conf_mutex);
err = rtlpriv->intf_ops->adapter_start(hw); err = rtlpriv->intf_ops->adapter_start(hw);
if (err) if (!err)
goto out;
rtl_watch_dog_timer_callback((unsigned long)hw); rtl_watch_dog_timer_callback((unsigned long)hw);
out:
mutex_unlock(&rtlpriv->locks.conf_mutex); mutex_unlock(&rtlpriv->locks.conf_mutex);
return err; return err;
} }
......
This diff is collapsed.
...@@ -113,32 +113,19 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw) ...@@ -113,32 +113,19 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw)
/*Set HW definition to determine if it supports ASPM. */ /*Set HW definition to determine if it supports ASPM. */
switch (rtlpci->const_support_pciaspm) { switch (rtlpci->const_support_pciaspm) {
case 0:{ case 0:
/*Not support ASPM. */ /*Not support ASPM. */
bool support_aspm = false; ppsc->support_aspm = false;
ppsc->support_aspm = support_aspm;
break; break;
} case 1:
case 1:{
/*Support ASPM. */ /*Support ASPM. */
bool support_aspm = true; ppsc->support_aspm = true;
bool support_backdoor = true; ppsc->support_backdoor = true;
ppsc->support_aspm = support_aspm;
/*if(priv->oem_id == RT_CID_TOSHIBA &&
!priv->ndis_adapter.amd_l1_patch)
support_backdoor = false; */
ppsc->support_backdoor = support_backdoor;
break; break;
}
case 2: case 2:
/*ASPM value set by chipset. */ /*ASPM value set by chipset. */
if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL) { if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL)
bool support_aspm = true; ppsc->support_aspm = true;
ppsc->support_aspm = support_aspm;
}
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
...@@ -152,13 +139,11 @@ static bool _rtl_pci_platform_switch_device_pci_aspm( ...@@ -152,13 +139,11 @@ static bool _rtl_pci_platform_switch_device_pci_aspm(
u8 value) u8 value)
{ {
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
bool bresult = false;
value |= 0x40; value |= 0x40;
pci_write_config_byte(rtlpci->pdev, 0x80, value); pci_write_config_byte(rtlpci->pdev, 0x80, value);
return bresult; return false;
} }
/*When we set 0x01 to enable clk request. Set 0x0 to disable clk req.*/ /*When we set 0x01 to enable clk request. Set 0x0 to disable clk req.*/
...@@ -166,14 +151,11 @@ static bool _rtl_pci_switch_clk_req(struct ieee80211_hw *hw, u8 value) ...@@ -166,14 +151,11 @@ static bool _rtl_pci_switch_clk_req(struct ieee80211_hw *hw, u8 value)
{ {
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
u8 buffer; u8 buffer;
bool bresult = false;
buffer = value; buffer = value;
pci_write_config_byte(rtlpci->pdev, 0x81, value); pci_write_config_byte(rtlpci->pdev, 0x81, value);
bresult = true;
return bresult; return true;
} }
/*Disable RTL8192SE ASPM & Disable Pci Bridge ASPM*/ /*Disable RTL8192SE ASPM & Disable Pci Bridge ASPM*/
...@@ -191,6 +173,7 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw) ...@@ -191,6 +173,7 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
u16 pcibridge_linkctrlreg = pcipriv->ndis_adapter. u16 pcibridge_linkctrlreg = pcipriv->ndis_adapter.
pcibridge_linkctrlreg; pcibridge_linkctrlreg;
u16 aspmlevel = 0; u16 aspmlevel = 0;
u8 tmp_u1b = 0;
if (pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) { if (pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) {
RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE, RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
...@@ -204,11 +187,8 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw) ...@@ -204,11 +187,8 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
_rtl_pci_switch_clk_req(hw, 0x0); _rtl_pci_switch_clk_req(hw, 0x0);
} }
if (1) {
/*for promising device will in L0 state after an I/O. */ /*for promising device will in L0 state after an I/O. */
u8 tmp_u1b;
pci_read_config_byte(rtlpci->pdev, 0x80, &tmp_u1b); pci_read_config_byte(rtlpci->pdev, 0x80, &tmp_u1b);
}
/*Set corresponding value. */ /*Set corresponding value. */
aspmlevel |= BIT(0) | BIT(1); aspmlevel |= BIT(0) | BIT(1);
...@@ -224,7 +204,6 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw) ...@@ -224,7 +204,6 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, pcibridge_linkctrlreg); rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, pcibridge_linkctrlreg);
udelay(50); udelay(50);
} }
/* /*
......
...@@ -192,8 +192,8 @@ struct rtl_pci { ...@@ -192,8 +192,8 @@ struct rtl_pci {
u8 const_devicepci_aspm_setting; u8 const_devicepci_aspm_setting;
/*If it supports ASPM, Offset[560h] = 0x40, /*If it supports ASPM, Offset[560h] = 0x40,
otherwise Offset[560h] = 0x00. */ otherwise Offset[560h] = 0x00. */
bool b_support_aspm; bool support_aspm;
bool b_support_backdoor; bool support_backdoor;
/*QOS & EDCA */ /*QOS & EDCA */
enum acm_method acm_method; enum acm_method acm_method;
......
...@@ -63,7 +63,6 @@ EXPORT_SYMBOL(rtl_ps_enable_nic); ...@@ -63,7 +63,6 @@ EXPORT_SYMBOL(rtl_ps_enable_nic);
bool rtl_ps_disable_nic(struct ieee80211_hw *hw) bool rtl_ps_disable_nic(struct ieee80211_hw *hw)
{ {
bool status = true;
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
/*<1> Stop all timer */ /*<1> Stop all timer */
...@@ -75,7 +74,7 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw) ...@@ -75,7 +74,7 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw)
/*<3> Disable Adapter */ /*<3> Disable Adapter */
rtlpriv->cfg->ops->hw_disable(hw); rtlpriv->cfg->ops->hw_disable(hw);
return status; return true;
} }
EXPORT_SYMBOL(rtl_ps_disable_nic); EXPORT_SYMBOL(rtl_ps_disable_nic);
......
...@@ -171,7 +171,6 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw, ...@@ -171,7 +171,6 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw) static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
int err = -EIO;
u32 counter = 0; u32 counter = 0;
u32 value32; u32 value32;
...@@ -184,7 +183,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw) ...@@ -184,7 +183,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
("chksum report faill ! REG_MCUFWDL:0x%08x .\n", ("chksum report faill ! REG_MCUFWDL:0x%08x .\n",
value32)); value32));
goto exit; return -EIO;
} }
RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
...@@ -204,8 +203,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw) ...@@ -204,8 +203,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
("Polling FW ready success!!" ("Polling FW ready success!!"
" REG_MCUFWDL:0x%08x .\n", " REG_MCUFWDL:0x%08x .\n",
value32)); value32));
err = 0; return 0;
goto exit;
} }
mdelay(FW_8192C_POLLING_DELAY); mdelay(FW_8192C_POLLING_DELAY);
...@@ -214,9 +212,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw) ...@@ -214,9 +212,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
("Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", value32)); ("Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", value32));
return -EIO;
exit:
return err;
} }
int rtl92c_download_fw(struct ieee80211_hw *hw) int rtl92c_download_fw(struct ieee80211_hw *hw)
...@@ -226,16 +222,14 @@ int rtl92c_download_fw(struct ieee80211_hw *hw) ...@@ -226,16 +222,14 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
struct rtl92c_firmware_header *pfwheader; struct rtl92c_firmware_header *pfwheader;
u8 *pfwdata; u8 *pfwdata;
u32 fwsize; u32 fwsize;
int err;
enum version_8192c version = rtlhal->version; enum version_8192c version = rtlhal->version;
const struct firmware *firmware; const struct firmware *firmware;
printk(KERN_INFO "rtl8192cu: Loading firmware file %s\n", printk(KERN_INFO "rtl8192c: Loading firmware file %s\n",
rtlpriv->cfg->fw_name); rtlpriv->cfg->fw_name);
err = request_firmware(&firmware, rtlpriv->cfg->fw_name, if (request_firmware(&firmware, rtlpriv->cfg->fw_name,
rtlpriv->io.dev); rtlpriv->io.dev)) {
if (err) { printk(KERN_ERR "rtl8192c: Firmware loading failed\n");
printk(KERN_ERR "rtl8192cu: Firmware loading failed\n");
return 1; return 1;
} }
...@@ -267,8 +261,7 @@ int rtl92c_download_fw(struct ieee80211_hw *hw) ...@@ -267,8 +261,7 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
_rtl92c_write_fw(hw, version, pfwdata, fwsize); _rtl92c_write_fw(hw, version, pfwdata, fwsize);
_rtl92c_enable_fw_download(hw, false); _rtl92c_enable_fw_download(hw, false);
err = _rtl92c_fw_free_to_go(hw); if (_rtl92c_fw_free_to_go(hw)) {
if (err) {
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
("Firmware is not ready to run!\n")); ("Firmware is not ready to run!\n"));
} else { } else {
...@@ -303,7 +296,6 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw, ...@@ -303,7 +296,6 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
u16 box_reg, box_extreg; u16 box_reg, box_extreg;
u8 u1b_tmp; u8 u1b_tmp;
bool isfw_read = false; bool isfw_read = false;
u8 buf_index;
bool bwrite_sucess = false; bool bwrite_sucess = false;
u8 wait_h2c_limmit = 100; u8 wait_h2c_limmit = 100;
u8 wait_writeh2c_limmit = 100; u8 wait_writeh2c_limmit = 100;
...@@ -414,7 +406,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw, ...@@ -414,7 +406,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
case 1: case 1:
boxcontent[0] &= ~(BIT(7)); boxcontent[0] &= ~(BIT(7));
memcpy((u8 *) (boxcontent) + 1, memcpy((u8 *) (boxcontent) + 1,
p_cmdbuffer + buf_index, 1); p_cmdbuffer, 1);
for (idx = 0; idx < 4; idx++) { for (idx = 0; idx < 4; idx++) {
rtl_write_byte(rtlpriv, box_reg + idx, rtl_write_byte(rtlpriv, box_reg + idx,
...@@ -424,7 +416,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw, ...@@ -424,7 +416,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
case 2: case 2:
boxcontent[0] &= ~(BIT(7)); boxcontent[0] &= ~(BIT(7));
memcpy((u8 *) (boxcontent) + 1, memcpy((u8 *) (boxcontent) + 1,
p_cmdbuffer + buf_index, 2); p_cmdbuffer, 2);
for (idx = 0; idx < 4; idx++) { for (idx = 0; idx < 4; idx++) {
rtl_write_byte(rtlpriv, box_reg + idx, rtl_write_byte(rtlpriv, box_reg + idx,
...@@ -434,7 +426,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw, ...@@ -434,7 +426,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
case 3: case 3:
boxcontent[0] &= ~(BIT(7)); boxcontent[0] &= ~(BIT(7));
memcpy((u8 *) (boxcontent) + 1, memcpy((u8 *) (boxcontent) + 1,
p_cmdbuffer + buf_index, 3); p_cmdbuffer, 3);
for (idx = 0; idx < 4; idx++) { for (idx = 0; idx < 4; idx++) {
rtl_write_byte(rtlpriv, box_reg + idx, rtl_write_byte(rtlpriv, box_reg + idx,
...@@ -444,9 +436,9 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw, ...@@ -444,9 +436,9 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
case 4: case 4:
boxcontent[0] |= (BIT(7)); boxcontent[0] |= (BIT(7));
memcpy((u8 *) (boxextcontent), memcpy((u8 *) (boxextcontent),
p_cmdbuffer + buf_index, 2); p_cmdbuffer, 2);
memcpy((u8 *) (boxcontent) + 1, memcpy((u8 *) (boxcontent) + 1,
p_cmdbuffer + buf_index + 2, 2); p_cmdbuffer + 2, 2);
for (idx = 0; idx < 2; idx++) { for (idx = 0; idx < 2; idx++) {
rtl_write_byte(rtlpriv, box_extreg + idx, rtl_write_byte(rtlpriv, box_extreg + idx,
...@@ -461,9 +453,9 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw, ...@@ -461,9 +453,9 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
case 5: case 5:
boxcontent[0] |= (BIT(7)); boxcontent[0] |= (BIT(7));
memcpy((u8 *) (boxextcontent), memcpy((u8 *) (boxextcontent),
p_cmdbuffer + buf_index, 2); p_cmdbuffer, 2);
memcpy((u8 *) (boxcontent) + 1, memcpy((u8 *) (boxcontent) + 1,
p_cmdbuffer + buf_index + 2, 3); p_cmdbuffer + 2, 3);
for (idx = 0; idx < 2; idx++) { for (idx = 0; idx < 2; idx++) {
rtl_write_byte(rtlpriv, box_extreg + idx, rtl_write_byte(rtlpriv, box_extreg + idx,
......
...@@ -766,7 +766,7 @@ struct rtl_rfkill { ...@@ -766,7 +766,7 @@ struct rtl_rfkill {
#define IQK_MATRIX_REG_NUM 8 #define IQK_MATRIX_REG_NUM 8
#define IQK_MATRIX_SETTINGS_NUM (1 + 24 + 21) #define IQK_MATRIX_SETTINGS_NUM (1 + 24 + 21)
struct iqk_matrix_regs { struct iqk_matrix_regs {
bool b_iqk_done; bool iqk_done;
long value[1][IQK_MATRIX_REG_NUM]; long value[1][IQK_MATRIX_REG_NUM];
}; };
...@@ -1621,19 +1621,19 @@ struct bt_coexist_info { ...@@ -1621,19 +1621,19 @@ struct bt_coexist_info {
u32 bt_edca_ul; u32 bt_edca_ul;
u32 bt_edca_dl; u32 bt_edca_dl;
bool b_init_set; bool init_set;
bool b_bt_busy_traffic; bool bt_busy_traffic;
bool b_bt_traffic_mode_set; bool bt_traffic_mode_set;
bool b_bt_non_traffic_mode_set; bool bt_non_traffic_mode_set;
bool b_fw_coexist_all_off; bool fw_coexist_all_off;
bool b_sw_coexist_all_off; bool sw_coexist_all_off;
u32 current_state; u32 current_state;
u32 previous_state; u32 previous_state;
u8 bt_pre_rssi_state; u8 bt_pre_rssi_state;
u8 b_reg_bt_iso; u8 reg_bt_iso;
u8 b_reg_bt_sco; u8 reg_bt_sco;
}; };
......
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