staging: rtl8192e: Remove variable priv->rf_chip from driver
cover staging: rtl8192e: Remove variable priv->rf_chip from driver
priv->rf_chip is initialized to RF_8256 and never changed. Keep code that is executed under condition (priv->rf_chip == RF_8256) and remove dead code including unused variables.
Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
Philipp Hortmann (11):
staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_rf_read
staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_rf_write
staging: rtl8192e: Remove priv->rf_chip in rtl92e_set_tx_power
staging: rtl8192e: Remove priv->rf_chip in rtl92e_config_phy
staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_tx_power_level
staging: rtl8192e: Remove priv->rf_chip in
_rtl92e_phy_switch_channel_step
staging: rtl8192e: Remove priv->rf_chip in
_rtl92e_set_bw_mode_work_item
staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_rf_power_state
staging: rtl8192e: Remove rf_chip in
_rtl92e_get_supported_wireless_mode
staging: rtl8192e: Remove priv->rf_chip in _rtl92e_get_channel_map
staging: rtl8192e: Remove priv->rf_chip
.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 - .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 431 ++++++------------ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 23 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 10 - 4 files changed, 138 insertions(+), 328 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/11 staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_rf_read
priv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_phy_rf_read as those are dead code.
--- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +18 -25
@@ -82,24 +82,20 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, Offset &=0x3f ; -if (priv->rf_chip ==RF_8256 ) { -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0xf00 ,0x0 ); -if (Offset >=31 ) { - priv->rf_reg_0value[eRFPath] |=0x140 ; -rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] <<16 )); - NewOffset = Offset -30 ; - }else if (Offset >=16 ) { - priv->rf_reg_0value[eRFPath] |=0x100 ; - priv->rf_reg_0value[eRFPath] &= (~0x40 ); -rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] <<16 )); - - NewOffset = Offset -15 ; - }else - NewOffset = Offset; +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0xf00 ,0x0 ); +if (Offset >=31 ) { + priv->rf_reg_0value[eRFPath] |=0x140 ; +rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] <<16 )); + NewOffset = Offset -30 ; + }else if (Offset >=16 ) { + priv->rf_reg_0value[eRFPath] |=0x100 ; + priv->rf_reg_0value[eRFPath] &= (~0x40 ); +rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] <<16 )); + NewOffset = Offset -15 ; }else { NewOffset = Offset; }
@@ -113,15 +109,12 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, ret =rtl92e_get_bb_reg (dev, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); -if (priv->rf_chip ==RF_8256 ) { - priv->rf_reg_0value[eRFPath] &=0xebf ; - -rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->rf_reg_0value[eRFPath] <<16 )); + priv->rf_reg_0value[eRFPath] &=0xebf ; -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0x300 ,0x3 ); - } +rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, bMaskDWord, + (priv->rf_reg_0value[eRFPath] <<16 )); +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0x300 ,0x3 );return ret;
Signature · 1 line
2.39.2
PATCH 2/11 staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_rf_write
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_phy_rf_write as those are dead code.
--- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +21 -25
@@ -129,24 +129,22 @@ static void _rtl92e_phy_rf_write(struct net_device *dev,struct bb_reg_definition *pPhyReg = &priv->phy_reg_def[eRFPath]; Offset &=0x3f ; -if (priv->rf_chip ==RF_8256 ) { -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0xf00 ,0x0 ); -if (Offset >=31 ) { - priv->rf_reg_0value[eRFPath] |=0x140 ; -rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] <<16 )); - NewOffset = Offset -30 ; - }else if (Offset >=16 ) { - priv->rf_reg_0value[eRFPath] |=0x100 ; - priv->rf_reg_0value[eRFPath] &= (~0x40 ); -rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] <<16 )); - NewOffset = Offset -15 ; - }else - NewOffset = Offset; +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0xf00 ,0x0 ); + +if (Offset >=31 ) { + priv->rf_reg_0value[eRFPath] |=0x140 ; +rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] <<16 )); + NewOffset = Offset -30 ; + }else if (Offset >=16 ) { + priv->rf_reg_0value[eRFPath] |=0x100 ; + priv->rf_reg_0value[eRFPath] &= (~0x40 ); +rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] <<16 )); + NewOffset = Offset -15 ; }else { NewOffset = Offset; }
@@ -158,15 +156,13 @@ static void _rtl92e_phy_rf_write(struct net_device *dev,if (Offset ==0x0 ) priv->rf_reg_0value[eRFPath] = Data; -if (priv->rf_chip ==RF_8256 ) { -if (Offset !=0 ) { - priv->rf_reg_0value[eRFPath] &=0xebf ; -rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, - bMaskDWord, - (priv->rf_reg_0value[eRFPath] <<16 )); - } -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0x300 ,0x3 ); +if (Offset !=0 ) { + priv->rf_reg_0value[eRFPath] &=0xebf ; +rtl92e_set_bb_reg (dev, pPhyReg->rf3wireOffset, + bMaskDWord, + (priv->rf_reg_0value[eRFPath] <<16 )); } +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4,0x300 ,0x3 ); } void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
Signature · 1 line
2.39.2
PATCH 3/11 staging: rtl8192e: Remove priv->rf_chip in rtl92e_set_tx_power
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function rtl92e_set_tx_power as it is dead code.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +2 -13
@@ -485,19 +485,8 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel -1 ]; } -switch (priv->rf_chip) { -case RF_8225 : -break ; -case RF_8256 : -rtl92e_set_cck_tx_power (dev, powerlevel); -rtl92e_set_ofdm_tx_power (dev, powerlevelOFDM24G); -break ; -case RF_8258 : -break ; -default : -netdev_err (dev,"Invalid RF Chip ID.\n" ); -break ; - } +rtl92e_set_cck_tx_power (dev, powerlevel); +rtl92e_set_ofdm_tx_power (dev, powerlevelOFDM24G); }bool rtl92e_config_phy (struct net_device *dev)
Signature · 1 line
2.39.2
PATCH 4/11 staging: rtl8192e: Remove priv->rf_chip in rtl92e_config_phy
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function rtl92e_config_phy as it is dead code.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -16
@@ -491,25 +491,10 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel)bool rtl92e_config_phy (struct net_device *dev) { -struct r8192_priv *priv =rtllib_priv (dev);bool rtStatus = true; -switch (priv->rf_chip) { -case RF_8225 : -break ; -case RF_8256 : - rtStatus =rtl92e_config_rf (dev); -break ; - -case RF_8258 : -break ; -case RF_PSEUDO_11N : -break ; + rtStatus =rtl92e_config_rf (dev); -default : -netdev_err (dev,"Invalid RF Chip ID.\n" ); -break ; - }return rtStatus; }
Signature · 1 line
2.39.2
PATCH 5/11 staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_tx_power_level
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_set_tx_power_level as it is dead code.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +2 -15
@@ -542,21 +542,8 @@ static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel)u8 powerlevel = priv->tx_pwr_level_cck[channel -1 ];u8 powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel -1 ]; -switch (priv->rf_chip) { -case RF_8225 : -break ; - -case RF_8256 : -rtl92e_set_cck_tx_power (dev, powerlevel); -rtl92e_set_ofdm_tx_power (dev, powerlevelOFDM24G); -break ; - -case RF_8258 : -break ; -default : -netdev_warn (dev,"%s(): Invalid RF Chip ID\n" , __func__); -break ; - } +rtl92e_set_cck_tx_power (dev, powerlevel); +rtl92e_set_ofdm_tx_power (dev, powerlevelOFDM24G); } static u8 _rtl92e_phy_set_sw_chnl_cmd_array(struct net_device *dev,
Signature · 1 line
2.39.2
PATCH 6/11 staging: rtl8192e: Remove priv->rf_chip in _rtl92e_phy_switch_channel_step
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_phy_switch_channel_step as it is dead code.
--- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 83 ++++--------------- 1 file changed, 16 insertions(+), 67 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +16 -67
@@ -14,24 +14,6 @@#include "table.h" -static u32 RF_CHANNEL_TABLE_ZEBRA [] = { -0 , -0x085c , -0x08dc , -0x095c , -0x09dc , -0x0a5c , -0x0adc , -0x0b5c , -0x0bdc , -0x0c5c , -0x0cdc , -0x0d5c , -0x0ddc , -0x0e5c , -0x0f72 , -}; -/*************************Define local function prototype**********************/ static u32 _rtl92e_phy_rf_fw_read(struct net_device *dev,
@@ -608,58 +590,25 @@ static u8 _rtl92e_phy_switch_channel_step(struct net_device *dev, u8 channel, 0, 0, 0); RfDependCmdCnt =0 ; -switch (priv->rf_chip) { -case RF_8225 : -if (!(channel >=1 && channel <=14 )) { -netdev_err (dev, -"Invalid channel requested for 8225: %d\n" , - channel); -return false; - } -_rtl92e_phy_set_sw_chnl_cmd_array (dev, - ieee->RfDependCmd, - RfDependCmdCnt++, -MAX_RFDEPENDCMD_CNT , - CmdID_RF_WriteReg, - rZebra1_Channel, -RF_CHANNEL_TABLE_ZEBRA [channel], -10 ); -_rtl92e_phy_set_sw_chnl_cmd_array (dev, - ieee->RfDependCmd, - RfDependCmdCnt++, -MAX_RFDEPENDCMD_CNT , - CmdID_End,0 ,0 ,0 ); -break ; - -case RF_8256 : -if (!(channel >=1 && channel <=14 )) { -netdev_err (dev, -"Invalid channel requested for 8256: %d\n" , - channel); -return false; - } -_rtl92e_phy_set_sw_chnl_cmd_array (dev, - ieee->RfDependCmd, - RfDependCmdCnt++, -MAX_RFDEPENDCMD_CNT , - CmdID_RF_WriteReg, - rZebra1_Channel, - channel,10 ); -_rtl92e_phy_set_sw_chnl_cmd_array (dev, - ieee->RfDependCmd, - RfDependCmdCnt++, -MAX_RFDEPENDCMD_CNT , - CmdID_End,0 ,0 ,0 ); -break ; - -case RF_8258 : -break ; -default : -netdev_warn (dev,"Unknown RF Chip ID\n" ); +if (!(channel >=1 && channel <=14 )) { +netdev_err (dev, +"Invalid channel requested for 8256: %d\n" , + channel);return false; } - +_rtl92e_phy_set_sw_chnl_cmd_array (dev, + ieee->RfDependCmd, + RfDependCmdCnt++, +MAX_RFDEPENDCMD_CNT , + CmdID_RF_WriteReg, + rZebra1_Channel, + channel,10 ); +_rtl92e_phy_set_sw_chnl_cmd_array (dev, + ieee->RfDependCmd, + RfDependCmdCnt++, +MAX_RFDEPENDCMD_CNT , + CmdID_End,0 ,0 ,0 ); do { switch (*stage) {
Signature · 1 line
2.39.2
PATCH 7/11 staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_bw_mode_work_item
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_set_bw_mode_work_item as those are dead code.
--- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +1 -23
@@ -849,10 +849,6 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev)struct r8192_priv *priv =rtllib_priv (dev);u8 regBwOpMode; -if (priv->rf_chip ==RF_PSEUDO_11N ) { - priv->set_bw_mode_in_progress = false; -return ; - }if (!priv->up) {netdev_err (dev,"%s(): Driver is not initialized\n" , __func__);return ;
@@ -918,25 +914,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) } -switch (priv->rf_chip) { -case RF_8225 : -break ; - -case RF_8256 : -rtl92e_set_bandwidth (dev, priv->current_chnl_bw); -break ; - -case RF_8258 : -break ; - -case RF_PSEUDO_11N : -break ; - -default : -netdev_info (dev,"%s(): Unknown RFChipID: %d\n" , __func__, - priv->rf_chip); -break ; - } +rtl92e_set_bandwidth (dev, priv->current_chnl_bw);atomic_dec (&(priv->rtllib->atm_swbw)); priv->set_bw_mode_in_progress = false;
Signature · 1 line
2.39.2
PATCH 8/11 staging: rtl8192e: Remove priv->rf_chip in _rtl92e_set_rf_power_state
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove conditions in function _rtl92e_set_rf_power_state as those are dead code. Removed unnecessary blank lines to shorten code.
--- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 186 +++++++----------- 1 file changed, 76 insertions(+), 110 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +76 -110
@@ -1040,129 +1040,95 @@ static bool _rtl92e_set_rf_power_state(struct net_device *dev,return false; priv->set_rf_pwr_state_in_progress = true; -switch (priv->rf_chip) { -case RF_8256 : -switch (rf_power_state) { -case rf_on: -if ((priv->rtllib->rf_power_state == rf_off) && -RT_IN_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC )) { -bool rtstatus; -u32 InitilizeCount =3 ; - -do { - InitilizeCount--; - rtstatus =rtl92e_enable_nic (dev); - }while (!rtstatus && (InitilizeCount >0 )); - -if (!rtstatus) { -netdev_err (dev, -"%s(): Failed to initialize Adapter.\n" , - __func__); - priv->set_rf_pwr_state_in_progress = false; -return false; - } - -RT_CLEAR_PS_LEVEL (psc, -RT_RF_OFF_LEVL_HALT_NIC ); - }else { -rtl92e_writeb (dev,ANAPAR ,0x37 ); -mdelay (1 ); -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter1, -0x4 ,0x1 ); - priv->hw_rf_off_action =0 ; - -rtl92e_set_bb_reg (dev, rFPGA0_XA_RFInterfaceOE, -BIT4 ,0x1 ); -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4, -0x300 ,0x3 ); -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter1, -0x18 ,0x3 ); -rtl92e_set_bb_reg (dev, rOFDM0_TRxPathEnable, -0x3 ,0x3 ); -rtl92e_set_bb_reg (dev, rOFDM1_TRxPathEnable, -0x3 ,0x3 ); -rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter1, -0x60 ,0x3 ); - +switch (rf_power_state) { +case rf_on: +if ((priv->rtllib->rf_power_state == rf_off) && +RT_IN_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC )) { +bool rtstatus; +u32 InitilizeCount =3 ; + +do { + InitilizeCount--; + rtstatus =rtl92e_enable_nic (dev); + }while (!rtstatus && (InitilizeCount >0 )); +if (!rtstatus) { +netdev_err (dev, +"%s(): Failed to initialize Adapter.\n" , + __func__); + priv->set_rf_pwr_state_in_progress = false; +return false; } - +RT_CLEAR_PS_LEVEL (psc, +RT_RF_OFF_LEVL_HALT_NIC ); + }else { +rtl92e_writeb (dev,ANAPAR ,0x37 ); +mdelay (1 ); +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter1, +0x4 ,0x1 ); + priv->hw_rf_off_action =0 ; +rtl92e_set_bb_reg (dev, rFPGA0_XA_RFInterfaceOE, +BIT4 ,0x1 ); +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter4, +0x300 ,0x3 ); +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter1, +0x18 ,0x3 ); +rtl92e_set_bb_reg (dev, rOFDM0_TRxPathEnable, +0x3 ,0x3 ); +rtl92e_set_bb_reg (dev, rOFDM1_TRxPathEnable, +0x3 ,0x3 ); +rtl92e_set_bb_reg (dev, rFPGA0_AnalogParameter1, +0x60 ,0x3 ); + } +break ; +case rf_sleep: +if (priv->rtllib->rf_power_state == rf_off)break ; - -case rf_sleep: -if (priv->rtllib->rf_power_state == rf_off) +for (QueueID =0 , i =0 ; QueueID <MAX_TX_QUEUE ; ) { + ring = &priv->tx_ring[QueueID]; +if (skb_queue_len (&ring->queue) ==0 ) { + QueueID++; +continue ; + }else { +udelay (10 ); + i++; + } +if (i >= MAX_DOZE_WAITING_TIMES_9x)break ; - - -for (QueueID =0 , i =0 ; QueueID <MAX_TX_QUEUE ; ) { - ring = &priv->tx_ring[QueueID]; - -if (skb_queue_len (&ring->queue) ==0 ) { - QueueID++; -continue ; - }else { -udelay (10 ); - i++; - } - -if (i >= MAX_DOZE_WAITING_TIMES_9x) -break ; + } +rtl92e_set_rf_off (dev); +break ; +case rf_off: +for (QueueID =0 , i =0 ; QueueID <MAX_TX_QUEUE ; ) { + ring = &priv->tx_ring[QueueID]; +if (skb_queue_len (&ring->queue) ==0 ) { + QueueID++; +continue ; + }else { +udelay (10 ); + i++; } +if (i >= MAX_DOZE_WAITING_TIMES_9x) +break ; + } +if (psc->RegRfPsLevel &RT_RF_OFF_LEVL_HALT_NIC && + !RT_IN_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC )) { +rtl92e_disable_nic (dev); +RT_SET_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC ); + }else if (!(psc->RegRfPsLevel & +RT_RF_OFF_LEVL_HALT_NIC )) {rtl92e_set_rf_off (dev); -break ; - -case rf_off: -for (QueueID =0 , i =0 ; QueueID <MAX_TX_QUEUE ; ) { - ring = &priv->tx_ring[QueueID]; - -if (skb_queue_len (&ring->queue) ==0 ) { - QueueID++; -continue ; - }else { -udelay (10 ); - i++; - } - -if (i >= MAX_DOZE_WAITING_TIMES_9x) -break ; - } - -if (psc->RegRfPsLevel &RT_RF_OFF_LEVL_HALT_NIC && - !RT_IN_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC )) { -rtl92e_disable_nic (dev); -RT_SET_PS_LEVEL (psc,RT_RF_OFF_LEVL_HALT_NIC ); - }else if (!(psc->RegRfPsLevel & -RT_RF_OFF_LEVL_HALT_NIC )) { -rtl92e_set_rf_off (dev); - } - -break ; - -default : - bResult = false; -netdev_warn (dev, -"%s(): Unknown state requested: 0x%X.\n" , - __func__, rf_power_state); -break ; } -break ; -default : -netdev_warn (dev,"%s(): Unknown RF type\n" , __func__); + bResult = false; +netdev_warn (dev, +"%s(): Unknown state requested: 0x%X.\n" , + __func__, rf_power_state);break ; }if (bResult) { priv->rtllib->rf_power_state = rf_power_state; - -switch (priv->rf_chip) { -case RF_8256 : -break ; - -default : -netdev_warn (dev,"%s(): Unknown RF type\n" , __func__); -break ; - } } priv->set_rf_pwr_state_in_progress = false;
Signature · 1 line
2.39.2
PATCH 9/11 staging: rtl8192e: Remove rf_chip in _rtl92e_get_supported_wireless_mode
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_get_supported_wireless_mode as it is dead code.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -15
@@ -595,23 +595,9 @@ static void _rtl92e_refresh_support_rate(struct r8192_priv *priv)static u8 _rtl92e_get_supported_wireless_mode (struct net_device *dev) { -struct r8192_priv *priv =rtllib_priv (dev);u8 ret =0 ; -switch (priv->rf_chip) { -case RF_8225 : -case RF_8256 : -case RF_6052 : -case RF_PSEUDO_11N : - ret = (WIRELESS_MODE_N_24G |WIRELESS_MODE_G |WIRELESS_MODE_B ); -break ; -case RF_8258 : - ret = (WIRELESS_MODE_A |WIRELESS_MODE_N_5G ); -break ; -default : - ret =WIRELESS_MODE_B ; -break ; - } + ret = (WIRELESS_MODE_N_24G |WIRELESS_MODE_G |WIRELESS_MODE_B );return ret; }
Signature · 1 line
2.39.2
PATCH 10/11 staging: rtl8192e: Remove priv->rf_chip in _rtl92e_get_channel_map
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and never changed. Remove condition in function _rtl92e_get_channel_map as it is dead code.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -7
@@ -895,13 +895,6 @@ static short _rtl92e_get_channel_map(struct net_device *dev)struct r8192_priv *priv =rtllib_priv (dev); -if ((priv->rf_chip !=RF_8225 ) && (priv->rf_chip !=RF_8256 ) && - (priv->rf_chip !=RF_6052 )) { -netdev_err (dev,"%s: unknown rf chip, can't set channel map\n" , - __func__); -return -1 ; - } -if (priv->chnl_plan >=COUNTRY_CODE_MAX ) {netdev_info (dev,"rtl819x_init:Error channel plan! Set to default.\n" );
Signature · 1 line
2.39.2
PATCH 11/11 staging: rtl8192e: Remove priv->rf_chip
In reply to Philipp Hortmannpriv->rf_chip is initialized to RF_8256 and not used. Remove initialization, variable and enum as it is dead code.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 10 ---------- 2 files changed, 12 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -2
@@ -432,8 +432,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)rtl92e_init_adaptive_rate (dev); - priv->rf_chip =RF_8256 ; -if (priv->reg_chnl_plan ==0xf ) priv->chnl_plan = priv->eeprom_chnl_plan;else
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -10
@@ -129,15 +129,6 @@ enum dcmg_txcmd_op { TXCMD_XXXX_CTRL, }; -enum rt_rf_type_819xu { -RF_TYPE_MIN =0 , -RF_8225 , -RF_8256 , -RF_8258 , -RF_6052 =4 , -RF_PSEUDO_11N =5 , -}; -enum rt_customer_id {RT_CID_DEFAULT =0 , RT_CID_819x_CAMEO =6 ,
@@ -221,7 +212,6 @@ struct r8192_priv {enum rt_customer_id customer_id; -enum rt_rf_type_819xu rf_chip;enum ht_channel_width current_chnl_bw;struct bb_reg_definition phy_reg_def[4 ];struct rate_adaptive rate_adaptive;
Signature · 1 line
2.39.2