diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2021-09-18 16:57:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-18 17:25:20 +0300 |
| commit | 96b461876304f73f4a5605d1c9654c4d81ae3c9c (patch) | |
| tree | 230004aec58de04040b505b9cbba7910b42df434 /drivers | |
| parent | 65e31407caea9d361a4e7d657b86ccf321eb62c7 (diff) | |
| download | linux-96b461876304f73f4a5605d1c9654c4d81ae3c9c.tar.xz | |
staging: r8188eu: brfoffbyhw is always false
As a consequence of the bHWPwrPindetect removal, brfoffbyhw is never set
to true any more. Remove the variable and code that depends on
brfoffbyhw == true.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210918135722.23976-1-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/os_dep/ioctl_linux.c | 7 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/os_dep/usb_intf.c | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/staging/r8188eu/include/rtw_pwrctrl.h index 28e4041acb98..a77fb76a0b09 100644 --- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h +++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h @@ -114,7 +114,6 @@ struct pwrctrl_priv { u8 wepkeymask; u8 bHWPowerdown;/* if support hw power down */ u8 bkeepfwalive; - u8 brfoffbyhw; }; #define rtw_get_ips_mode_req(pwrctrlpriv) \ diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c index ac218da94ce5..a76cb7bd6390 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -1289,11 +1289,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, int wait_status; struct wifidirect_info *pwdinfo = &padapter->wdinfo; - if (padapter->pwrctrlpriv.brfoffbyhw && padapter->bDriverStopped) { - ret = -EINVAL; - goto exit; - } - if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { /* P2P is enabled */ wait_for_surveydone = 200; @@ -1336,8 +1331,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, wrqu->data.length = ev - extra; wrqu->data.flags = 0; -exit: - return ret; } diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c index 306325818a9a..25dc90847380 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -305,7 +305,6 @@ int rtw_hw_resume(struct adapter *padapter) netif_wake_queue(pnetdev); pwrpriv->bkeepfwalive = false; - pwrpriv->brfoffbyhw = false; pwrpriv->rf_pwrstate = rf_on; pwrpriv->bips_processing = false; |