staging: wilc1000: move hif_workqueue static variables to 'wilc' structure

Avoid use of static variable hif_workqueue and move it inside 'wilc'
structure.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index f5617ac81c9607f610fdeff7872f2a444ac8fdf5..6facffc1e60c399edb3d326408c6eb0e79dd154a 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -188,7 +188,6 @@ struct join_bss_param {
 
 static struct host_if_drv *terminated_handle;
 static u8 p2p_listen_state;
-static struct workqueue_struct *hif_workqueue;
 static struct completion hif_driver_comp;
 static struct mutex hif_deinit_lock;
 static struct timer_list periodic_rssi;
@@ -226,7 +225,11 @@ wilc_alloc_work(struct wilc_vif *vif, void (*work_fun)(struct work_struct *),
 static int wilc_enqueue_work(struct host_if_msg *msg)
 {
        INIT_WORK(&msg->work, msg->fn);
-       if (!hif_workqueue || !queue_work(hif_workqueue, &msg->work))
+
+       if (!msg->vif || !msg->vif->wilc || !msg->vif->wilc->hif_workqueue)
+               return -EINVAL;
+
+       if (!queue_work(msg->vif->wilc->hif_workqueue, &msg->work))
                return -EINVAL;
 
        return 0;
@@ -3459,8 +3462,8 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
                init_completion(&hif_driver_comp);
                mutex_init(&hif_deinit_lock);
 
-               hif_workqueue = create_singlethread_workqueue("WILC_wq");
-               if (!hif_workqueue) {
+               wilc->hif_workqueue = create_singlethread_workqueue("WILC_wq");
+               if (!wilc->hif_workqueue) {
                        netdev_err(vif->ndev, "Failed to create workqueue\n");
                        kfree(hif_drv);
                        return -ENOMEM;
@@ -3538,7 +3541,7 @@ int wilc_deinit(struct wilc_vif *vif)
                                wait_for_completion(&msg->work_comp);
                        kfree(msg);
                }
-               destroy_workqueue(hif_workqueue);
+               destroy_workqueue(vif->wilc->hif_workqueue);
        }
 
        kfree(hif_drv);

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 8cccbbcaaa1b41d33d0ff3e8a48943103428f8cc..77641eb8fe6c0f5fa3212768e96d658a30752206 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -172,6 +172,7 @@ struct wilc {
        struct rf_info dummy_statistics;
        bool enable_ps;
        int clients_count;
+       struct workqueue_struct *hif_workqueue;
 };
 
 struct wilc_wfi_mon_priv {