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 10/11] staging: r8188eu: remove rtw_netif_stop_queue wrapper
Date: Sat, 15 Jan 2022 17:55:35 +0100 [thread overview]
Message-ID: <20220115165536.231210-11-martin@kaiser.cx> (raw)
In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx>
Remove the rtw_netif_stop_queue wrapper function. Call
netif_tx_stop_all_queues directly.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/osdep_service.h | 5 -----
drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++--
drivers/staging/r8188eu/os_dep/usb_intf.c | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index 51a22ffe41e2..fca8f3d116c2 100644
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -67,11 +67,6 @@ static inline int rtw_netif_queue_stopped(struct net_device *pnetdev)
netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 3));
}
-static inline void rtw_netif_stop_queue(struct net_device *pnetdev)
-{
- netif_tx_stop_all_queues(pnetdev);
-}
-
extern int RTW_STATUS_CODE(int error_code);
void *rtw_malloc2d(int h, int w, int size);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 96b49cee3ac4..ef4ba0f22c09 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -667,7 +667,7 @@ int _netdev_open(struct net_device *pnetdev)
netdev_open_error:
padapter->bup = false;
netif_carrier_off(pnetdev);
- rtw_netif_stop_queue(pnetdev);
+ netif_tx_stop_all_queues(pnetdev);
DBG_88E("-88eu_drv - drv_open fail, bup =%d\n", padapter->bup);
return -1;
}
@@ -769,7 +769,7 @@ int netdev_close(struct net_device *pnetdev)
/* s1. */
if (pnetdev) {
if (!rtw_netif_queue_stopped(pnetdev))
- rtw_netif_stop_queue(pnetdev);
+ netif_tx_stop_all_queues(pnetdev);
}
/* s2. */
diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index 91792dfd3bbe..1b1b8bb165ba 100644
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -236,7 +236,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
/* s1. */
if (pnetdev) {
netif_carrier_off(pnetdev);
- rtw_netif_stop_queue(pnetdev);
+ netif_tx_stop_all_queues(pnetdev);
}
/* s2. */
--
2.30.2
next prev parent reply other threads:[~2022-01-15 16:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-15 16:55 [PATCH 00/11] staging: r8188eu: clean up osdep_service.h Martin Kaiser
2022-01-15 16:55 ` [PATCH 01/11] staging: r8188eu: remove unused externl variables Martin Kaiser
2022-01-15 16:55 ` [PATCH 02/11] staging: r8188eu: remove unused macros Martin Kaiser
2022-01-15 16:55 ` [PATCH 03/11] staging: r8188eu: remove unused bitshift function Martin Kaiser
2022-01-15 16:55 ` [PATCH 04/11] staging: r8188eu: remove unused PATH_LENGTH_MAX define Martin Kaiser
2022-01-15 16:55 ` [PATCH 05/11] staging: r8188eu: remove rtw_list_delete wrapper Martin Kaiser
2022-01-15 16:55 ` [PATCH 06/11] staging: r8188eu: remove _cancel_timer wrapper Martin Kaiser
2022-01-15 16:55 ` [PATCH 07/11] staging: r8188eu: call msecs_to_jiffies in _set_timer Martin Kaiser
2022-01-15 16:55 ` [PATCH 08/11] staging: r8188eu: remove rtw_netif_wake_queue wrapper Martin Kaiser
2022-01-15 16:55 ` [PATCH 09/11] staging: r8188eu: remove rtw_netif_start_queue wrapper Martin Kaiser
2022-01-15 16:55 ` Martin Kaiser [this message]
2022-01-15 16:55 ` [PATCH 11/11] staging: r8188eu: remove _cancel_timer_ex wrapper Martin Kaiser
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=20220115165536.231210-11-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®