staging: gdm724x: gdm_mux: Remove create_workqueue()

With concurrency managed workqueues, use of dedicated workqueues
can be replaced by using system_wq. Drop mux_rx_wq by using system_wq.

Since there is only one work item per mux_dev and different mux_devs
do not need to be ordered, increase of concurrency level by switching
to system_wq should not break anything.

cancel_work_sync() is used to ensure that work is not pending or
executing on any CPU.

Lastly, since all devices are suspended, which shutdowns the work item
before the driver can be unregistered, it is guaranteed that no work
item is pending or executing by the time exit path runs.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gdm724x/gdm_mux.c b/drivers/staging/gdm724x/gdm_mux.c
index 445f836..937010b 100644 (file)
--- a/drivers/staging/gdm724x/gdm_mux.c
+++ b/drivers/staging/gdm724x/gdm_mux.c
@@ -26,8 +26,6 @@
 
 #include "gdm_mux.h"
 
-static struct workqueue_struct *mux_rx_wq;
-
 static u16 packet_type[TTY_MAX_COUNT] = {0xF011, 0xF010};
 
 #define USB_DEVICE_CDC_DATA(vid, pid) \
@@ -275,7 +273,7 @@ static void gdm_mux_rcv_complete(struct urb *urb)
                r->len = r->urb->actual_length;
                spin_lock_irqsave(&rx->to_host_lock, flags);
                list_add_tail(&r->to_host_list, &rx->to_host_list);
-               queue_work(mux_rx_wq, &mux_dev->work_rx.work);
+               schedule_work(&mux_dev->work_rx.work);
                spin_unlock_irqrestore(&rx->to_host_lock, flags);
        }
 }
@@ -602,6 +600,8 @@ static int gdm_mux_suspend(struct usb_interface *intf, pm_message_t pm_msg)
        mux_dev = tty_dev->priv_dev;
        rx = &mux_dev->rx;
 
+       cancel_work_sync(&mux_dev->work_rx.work);
+
        if (mux_dev->usb_state != PM_NORMAL) {
                dev_err(intf->usb_dev, "usb suspend - invalid state\n");
                return -1;
@@ -656,13 +656,6 @@ static struct usb_driver gdm_mux_driver = {
 
 static int __init gdm_usb_mux_init(void)
 {
-
-       mux_rx_wq = create_workqueue("mux_rx_wq");
-       if (!mux_rx_wq) {
-               pr_err("work queue create fail\n");
-               return -1;
-       }
-
        register_lte_tty_driver();
 
        return usb_register(&gdm_mux_driver);
@@ -672,11 +665,6 @@ static void __exit gdm_usb_mux_exit(void)
 {
        unregister_lte_tty_driver();
 
-       if (mux_rx_wq) {
-               flush_workqueue(mux_rx_wq);
-               destroy_workqueue(mux_rx_wq);
-       }
-
        usb_deregister(&gdm_mux_driver);
 }