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 v2 2/2] staging: r8188eu: remove rtw_hw_resume
Date: Mon, 13 Sep 2021 20:59:57 +0200 [thread overview]
Message-ID: <20210913185957.3166-3-martin@kaiser.cx> (raw)
In-Reply-To: <20210913185957.3166-1-martin@kaiser.cx>
The bHWPwrPindetect cleanup removed the only call to rtw_hw_resume.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
v2:
- rebased against today's staging-testing branch
drivers/staging/r8188eu/include/osdep_intf.h | 1 -
drivers/staging/r8188eu/os_dep/usb_intf.c | 39 --------------------
2 files changed, 40 deletions(-)
diff --git a/drivers/staging/r8188eu/include/osdep_intf.h b/drivers/staging/r8188eu/include/osdep_intf.h
index 5a2c7a98f023..da36770852f8 100644
--- a/drivers/staging/r8188eu/include/osdep_intf.h
+++ b/drivers/staging/r8188eu/include/osdep_intf.h
@@ -58,6 +58,5 @@ void rtw_ips_dev_unload(struct adapter *padapter);
int rtw_ips_pwr_up(struct adapter *padapter);
void rtw_ips_pwr_down(struct adapter *padapter);
-int rtw_hw_resume(struct adapter *padapter);
#endif /* _OSDEP_INTF_H_ */
diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index a23b0becb668..c40246bbb4f4 100644
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -278,45 +278,6 @@ static void process_spec_devid(const struct usb_device_id *pdid)
}
}
-int rtw_hw_resume(struct adapter *padapter)
-{
- struct pwrctrl_priv *pwrpriv;
- struct net_device *pnetdev = padapter->pnetdev;
-
- if (!padapter)
- goto error_exit;
- pwrpriv = &padapter->pwrctrlpriv;
- DBG_88E("==> rtw_hw_resume\n");
- _enter_pwrlock(&pwrpriv->lock);
- pwrpriv->bips_processing = true;
- rtw_reset_drv_sw(padapter);
-
- if (pm_netdev_open(pnetdev, false) != 0) {
- _exit_pwrlock(&pwrpriv->lock);
- goto error_exit;
- }
-
- netif_device_attach(pnetdev);
- netif_carrier_on(pnetdev);
-
- if (!netif_queue_stopped(pnetdev))
- netif_start_queue(pnetdev);
- else
- netif_wake_queue(pnetdev);
-
- pwrpriv->bkeepfwalive = false;
-
- pwrpriv->rf_pwrstate = rf_on;
- pwrpriv->bips_processing = false;
-
- _exit_pwrlock(&pwrpriv->lock);
-
- return 0;
-error_exit:
- DBG_88E("%s, Open net dev failed\n", __func__);
- return -1;
-}
-
static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
--
2.20.1
next prev parent reply other threads:[~2021-09-13 19:01 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 ` Martin Kaiser [this message]
2021-09-14 7:14 ` [PATCH v2 0/2] staging: r8188eu: more power management cleanup Greg Kroah-Hartman
2021-09-18 13:57 ` [PATCH v3 1/2] staging: r8188eu: brfoffbyhw is always false Martin Kaiser
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=20210913185957.3166-3-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;
as well as URLs for NNTP newsgroup(s).