staging: r8188eu: remove rtw_netif_stop_queue wrapper

Remove the rtw_netif_stop_queue wrapper function. Call
netif_tx_stop_all_queues directly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220115165536.231210-11-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index 51a22ffe41e24350b6411a4a1192148242c6391d..fca8f3d116c2e28b91248c78f9fe1d0ea35ccad7 100644 (file)
--- 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 96b49cee3ac44463ac70db1e69948dcdc740973a..ef4ba0f22c09744eaacb25c973c84277df2aa65d 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -667,7 +667,7 @@ netdev_open_normal_process:
 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 91792dfd3bbe42959b0e20c9e6a726dc9cc91b19..1b1b8bb165bad1711dc4cfdcef196bfa6573d0b2 100644 (file)
--- 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. */