Remove unused rf_set_sens variable
v4 cover Remove unused rf_set_sens variable
The rf_set_sens variable is declared but never set, so it is always NULL. Cleanup the unused rf_set_sens variable. Remove functions _rtl92e_wx_get_sens and _rtl92e_wx_set_sens which always returned error code after removal of rf_set_sens variable.
Cleanup unused max_sens and sens variable.
The patches are required to be applied in sequence.
Changes in v4:
1. Split changes into patch series per feedback from [email protected]
Changes in v3:
1. Fixed description to fit within 75 chars
2. Added suggested tags
per feedback from [email protected]
Changes in v2:
1. Removed function definition rf_set_sens
2. Removed usage of variable priv->rf_set_sens
3. Removed functions _rtl92e_wx_get_sens and _rtl92e_wx_set_sens
4. Cleaned up the variables sens and max_sens used in these functions
Changes in v1:
1. Fix comparison to NULL of variable rf_set_sens
Yogesh Hegde (4):
staging: rtl8192e: Remove unused rf_set_sens variable
staging: rtl8192e: Remove unused _rtl92e_wx_get_sens function
staging: rtl8192e: Remove unused _rtl92e_wx_set_sens function
staging: rtl8192e: Remove unused sens and max_sens from r8192_priv
struct
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 -- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 45 -------------------- 2 files changed, 48 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/4 staging: rtl8192e: Remove unused rf_set_sens variable
The rf_set_sens variable is declared but never set, so it is always NULL. This commit cleans up the unused rf_set_sens variable and removes the associated code that relied on it.
Specifically, the following changes have been made:
- Removed the range->sensitivity assignment, which was never used.
- Removed the sensitivity level get implementation, which always returns an error code.
- Removed the sensitivity level set implementation, which always returns an error code.
- Removed the rf_set_sens variable.
---
Changes in v4:
1. Split changes into patch series per feedback from [email protected]
Changes in v3:
1. Fixed description to fit within 75 chars
2. Added suggested tags
per feedback from [email protected]
Changes in v2:
1. Removed function definition rf_set_sens
2. Removed usage of variable priv->rf_set_sens
3. Removed functions _rtl92e_wx_get_sens and _rtl92e_wx_set_sens
4. Cleaned up the variables sens and max_sens used in these functions
Changes in v1:
1. Fix comparison to NULL of variable rf_set_sens
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 19 ++----------------- 2 files changed, 2 insertions(+), 18 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
@@ -231,7 +231,6 @@ struct r8192_priv {struct rt_stats stats;struct iw_statistics wstats; -short (*rf_set_sens)(struct net_device *dev,short sens);u8 (*rf_set_chan)(struct net_device *dev,u8 ch);struct rx_desc *rx_ring[MAX_RX_QUEUE ];
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +2 -17
@@ -311,10 +311,6 @@ static int _rtl92e_wx_get_range(struct net_device *dev,/* ~130 Mb/s real (802.11n) */ range->throughput =130 *1000 *1000 ; -if (priv->rf_set_sens !=NULL ) -/* signal level threshold range */ - range->sensitivity = priv->max_sens; - range->max_qual.qual =100 ; range->max_qual.level =0 ; range->max_qual.noise =0 ;
@@ -813,10 +809,7 @@ static int _rtl92e_wx_get_sens(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev); -if (priv->rf_set_sens ==NULL ) -return -1 ;/* we have not this support for this radio */ - wrqu->sens.value = priv->sens; -return 0 ; +return -1 ; } static int _rtl92e_wx_set_sens(struct net_device *dev,
@@ -831,15 +824,7 @@ static int _rtl92e_wx_set_sens(struct net_device *dev,return 0 ;mutex_lock (&priv->wx_mutex); -if (priv->rf_set_sens ==NULL ) { - err =-1 ;/* we have not this support for this radio */ - goto exit; - } -if (priv->rf_set_sens (dev, wrqu->sens.value) ==0 ) - priv->sens = wrqu->sens.value; -else - err = -EINVAL ; - + err =-1 ; exit:mutex_unlock (&priv->wx_mutex);
Signature · 1 line
2.34.1
PATCH v4 2/4 staging: rtl8192e: Remove unused _rtl92e_wx_get_sens function
In reply to Yogesh HegdeAfter removal of rf_set_sens variable, the _rtl92e_wx_get_sens function always returns an error code.
This commit removes the unused function and the respective ioctl.
Changes in v4:
1. Split changes into patch series per feedback from [email protected]
Changes in v3:
-- None
Changes in v2:
-- None
Changes in v1:
-- None --- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +0 -10
@@ -803,15 +803,6 @@ static int _rtl92e_wx_get_retry(struct net_device *dev,return 0 ; } -static int _rtl92e_wx_get_sens (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) -{ -struct r8192_priv *priv =rtllib_priv (dev); - -return -1 ; -} -static int _rtl92e_wx_set_sens (struct net_device *dev,struct iw_request_info *info,union iwreq_data *wrqu,char *extra)
@@ -1052,7 +1043,6 @@ static iw_handler r8192_wx_handlers[] = { [IW_IOCTL(SIOCSIWMODE)] = _rtl92e_wx_set_mode, [IW_IOCTL(SIOCGIWMODE)] = _rtl92e_wx_get_mode, [IW_IOCTL(SIOCSIWSENS)] = _rtl92e_wx_set_sens, - [IW_IOCTL(SIOCGIWSENS)] = _rtl92e_wx_get_sens, [IW_IOCTL(SIOCGIWRANGE)] = _rtl92e_wx_get_range, [IW_IOCTL(SIOCSIWAP)] = _rtl92e_wx_set_wap, [IW_IOCTL(SIOCGIWAP)] = _rtl92e_wx_get_wap,
Signature · 1 line
2.34.1
PATCH v4 3/4 staging: rtl8192e: Remove unused _rtl92e_wx_set_sens function
In reply to Yogesh HegdeAfter removal of rf_set_sens variable, the _rtl92e_wx_set_sens function always returns an error code.
This commit removes the unused function and the respective ioctl.
---
Changes in v4:
1. Split changes into patch series per feedback from [email protected]
Changes in v3:
-- None
Changes in v2:
-- None
Changes in v1:
-- None --- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +0 -20
@@ -803,25 +803,6 @@ static int _rtl92e_wx_get_retry(struct net_device *dev,return 0 ; } -static int _rtl92e_wx_set_sens (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) -{ -struct r8192_priv *priv =rtllib_priv (dev); - -short err =0 ; - -if (priv->hw_radio_off) -return 0 ; - -mutex_lock (&priv->wx_mutex); - err =-1 ; -exit: -mutex_unlock (&priv->wx_mutex); - -return err; -} -static int _rtl92e_wx_set_encode_ext (struct net_device *dev,struct iw_request_info *info,union iwreq_data *wrqu,char *extra)
@@ -1042,7 +1023,6 @@ static iw_handler r8192_wx_handlers[] = { [IW_IOCTL(SIOCGIWFREQ)] = _rtl92e_wx_get_freq, [IW_IOCTL(SIOCSIWMODE)] = _rtl92e_wx_set_mode, [IW_IOCTL(SIOCGIWMODE)] = _rtl92e_wx_get_mode, - [IW_IOCTL(SIOCSIWSENS)] = _rtl92e_wx_set_sens, [IW_IOCTL(SIOCGIWRANGE)] = _rtl92e_wx_get_range, [IW_IOCTL(SIOCSIWAP)] = _rtl92e_wx_set_wap, [IW_IOCTL(SIOCGIWAP)] = _rtl92e_wx_get_wap,
Signature · 1 line
2.34.1
Re: [PATCH v4 3/4] staging: rtl8192e: Remove unused _rtl92e_wx_set_sens function
Quoted 55 lines · Yogesh Hegde
After removal of
rf_set_sensvariable, the_rtl92e_wx_set_sensfunction always returns an error code.
This commit removes the unused function and the respective ioctl.Suggested-by Philipp Hortmann <[email protected]>Signed-off-by Yogesh Hegde <[email protected]>---
Changes in v4:
1. Split changes into patch series per feedback from [email protected]Changes in v3:
-- NoneChanges in v2:
-- NoneChanges in v1:
-- None --- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 20 -------------------- 1 file changed, 20 deletions(-)drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +0
-19@@ -803,25 +803,6 @@ static int _rtl92e_wx_get_retry(struct net_device *dev,return 0 ; } -static int _rtl92e_wx_set_sens (struct net_device *dev, -struct iw_request_info *info, -union iwreq_data *wrqu,char *extra) -{ -struct r8192_priv *priv =rtllib_priv (dev); - -short err =0 ; - -if (priv->hw_radio_off) -return 0 ; - -mutex_lock (&priv->wx_mutex); - err =-1 ; -exit: -mutex_unlock (&priv->wx_mutex); - -return err; -} -static int _rtl92e_wx_set_encode_ext (struct net_device *dev,struct iw_request_info *info,union iwreq_data *wrqu,char *extra)
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c static iw_handler r8192_wx_handlers[] = { · line 1028
Quoted 7 lines
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +0
-1@@ -1042,7 +1023,6 @@ static iw_handler r8192_wx_handlers[] = { [IW_IOCTL(SIOCGIWFREQ)] = _rtl92e_wx_get_freq, [IW_IOCTL(SIOCSIWMODE)] = _rtl92e_wx_set_mode, [IW_IOCTL(SIOCGIWMODE)] = _rtl92e_wx_get_mode, - [IW_IOCTL(SIOCSIWSENS)] = _rtl92e_wx_set_sens, [IW_IOCTL(SIOCGIWRANGE)] = _rtl92e_wx_get_range, [IW_IOCTL(SIOCSIWAP)] = _rtl92e_wx_set_wap, [IW_IOCTL(SIOCGIWAP)] = _rtl92e_wx_get_wap,
I can apply the first two patches but not this one. Did you do a git pull before?
Thanks for your support.
Bye Philipp
PATCH v4 4/4 staging: rtl8192e: Remove unused sens and max_sens from r8192_priv struct
In reply to Yogesh HegdeThe 'sens' and 'max_sens' fields in the 'r8192_priv' structure are no longer used by the driver. This commit removes these fields.
---
Changes in v4:
1. Split changes into patch series per feedback from [email protected]
Changes in v3:
-- None
Changes in v2:
-- None
Changes in v1:
-- None --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -2
@@ -270,8 +270,6 @@ struct r8192_priv {short promisc;short chan; -short sens; -short max_sens;bool ps_force;u32 irq_mask[2 ];
Signature · 1 line
2.34.1