Revert "wifi: libertas: WQ_PERCPU added to alloc_workqueue users"

This reverts commit 1e06a137513d ("wifi: libertas: WQ_PERCPU added
to alloc_workqueue users") since there's really no reason to use
per-CPU here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c
index 1e29e80cad611c3f8475349f7f1e760539438511..524034699972df8c90ba193407733023a43831af 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/if_sdio.c
+++ b/drivers/net/wireless/marvell/libertas/if_sdio.c
@@ -1181,8 +1181,7 @@ static int if_sdio_probe(struct sdio_func *func,
        spin_lock_init(&card->lock);
        INIT_LIST_HEAD(&card->packets);
 
-       card->workqueue = alloc_workqueue("libertas_sdio",
-                                         WQ_MEM_RECLAIM | WQ_PERCPU, 0);
+       card->workqueue = alloc_workqueue("libertas_sdio", WQ_MEM_RECLAIM, 0);
        if (unlikely(!card->workqueue)) {
                ret = -ENOMEM;
                goto err_queue;

diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c
index 699bae8971f822a47090fc1e7ce17132401f847b..b722a6587fd3de8b6375df03dce9734ecc519ceb 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/if_spi.c
+++ b/drivers/net/wireless/marvell/libertas/if_spi.c
@@ -1153,8 +1153,7 @@ static int if_spi_probe(struct spi_device *spi)
        priv->fw_ready = 1;
 
        /* Initialize interrupt handling stuff. */
-       card->workqueue = alloc_workqueue("libertas_spi",
-                                         WQ_MEM_RECLAIM | WQ_PERCPU, 0);
+       card->workqueue = alloc_workqueue("libertas_spi", WQ_MEM_RECLAIM, 0);
        if (!card->workqueue) {
                err = -ENOMEM;
                goto remove_card;

diff --git a/drivers/net/wireless/marvell/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c
index c51091e7c6c669289d42419f77da9fe3eb50fbe8..d1067874428f4629c289c7a473f25a6d30577aaa 100644 (file)
--- a/drivers/net/wireless/marvell/libertas_tf/main.c
+++ b/drivers/net/wireless/marvell/libertas_tf/main.c
@@ -708,7 +708,7 @@ EXPORT_SYMBOL_GPL(lbtf_bcn_sent);
 static int __init lbtf_init_module(void)
 {
        lbtf_deb_enter(LBTF_DEB_MAIN);
-       lbtf_wq = alloc_workqueue("libertastf", WQ_MEM_RECLAIM | WQ_PERCPU, 0);
+       lbtf_wq = alloc_workqueue("libertastf", WQ_MEM_RECLAIM, 0);
        if (lbtf_wq == NULL) {
                printk(KERN_ERR "libertastf: couldn't create workqueue\n");
                return -ENOMEM;