From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Michael Straube <straube.linux@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH v3 1/2] staging: r8188eu: brfoffbyhw is always false
Date: Sat, 18 Sep 2021 15:57:21 +0200 [thread overview]
Message-ID: <20210918135722.23976-1-martin@kaiser.cx> (raw)
In-Reply-To: <20210911161019.26881-1-martin@kaiser.cx>
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>
---
v3:
- another rebase against today's staging-testing branch
v2:
- rebased against today's staging-testing branch
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 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;
--
2.20.1
next prev parent reply other threads:[~2021-09-18 13:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-11 16:10 [PATCH 0/4] staging: r8188eu: more power management cleanup Martin Kaiser
2021-09-11 16:10 ` [PATCH 1/4] staging: r8188eu: bHWPwrPindetect is always false Martin Kaiser
2021-09-11 16:10 ` [PATCH 2/4] staging: r8188eu: brfoffbyhw " Martin Kaiser
2021-09-11 16:10 ` [PATCH 3/4] staging: r8188eu: remove rtw_hw_suspend Martin Kaiser
2021-09-11 16:10 ` [PATCH 4/4] staging: r8188eu: remove rtw_hw_resume Martin Kaiser
2021-09-13 16:22 ` [PATCH 0/4] staging: r8188eu: more power management cleanup Greg Kroah-Hartman
2021-09-13 18:59 ` [PATCH v2 0/2] " Martin Kaiser
2021-09-13 18:59 ` [PATCH v2 1/2] staging: r8188eu: brfoffbyhw is always false Martin Kaiser
2021-09-13 18:59 ` [PATCH v2 2/2] staging: r8188eu: remove rtw_hw_resume Martin Kaiser
2021-09-14 7:14 ` [PATCH v2 0/2] staging: r8188eu: more power management cleanup Greg Kroah-Hartman
2021-09-18 13:57 ` Martin Kaiser [this message]
2021-09-18 13:57 ` [PATCH v3 2/2] staging: r8188eu: remove rtw_hw_resume Martin Kaiser
2021-09-18 15:16 ` Michael Straube
2021-09-18 14:59 ` [PATCH v3 1/2] staging: r8188eu: brfoffbyhw is always false Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210918135722.23976-1-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®