lkml.org 
[lkml]   [2021]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] staging: r8188eu: brfoffbyhw is always false
    Date
    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>
    ---
    drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 -
    drivers/staging/r8188eu/os_dep/ioctl_linux.c | 7 -------
    drivers/staging/r8188eu/os_dep/usb_intf.c | 1 -
    3 files changed, 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 911bcb69d008..b6f2fa3abb6e 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 b174cc69ded7..fc5ed770cb71 100644
    --- a/drivers/staging/r8188eu/os_dep/usb_intf.c
    +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
    @@ -364,7 +364,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;
    --
    2.20.1
    \
     
     \ /
      Last update: 2021-09-11 18:11    [W:2.598 / U:0.880 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site