mmc: sdhci: Use work structs instead of tasklets

The driver can happily live without an atomic context and tasklets,
so turn the tasklets into the work structs.

Tasklets handlers still grab irqsave spinlocks, but we'll deal
with it in a separate patch.

Patch based on: http://thread.gmane.org/gmane.linux.kernel.mmc/2579.

Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Jeremie Samuel <jeremie.samuel.ext@parrot.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 7a190fe4dff1b799958bfedf7bb01dd5d405a0f8..9e3652c39694532be6e7236d820ad74b3c8ff0af 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -120,7 +120,7 @@ static void sdhci_bcm_kona_sd_init(struct sdhci_host *host)
  * Software emulation of the SD card insertion/removal. Set insert=1 for insert
  * and insert=0 for removal. The card detection is done by GPIO. For Broadcom
  * IP to function properly the bit 0 of CORESTAT register needs to be set/reset
- * to generate the CD IRQ handled in sdhci.c which schedules card_tasklet.
+ * to generate the CD IRQ handled in sdhci.c which schedules card_detect_work.
  */
 static int sdhci_bcm_kona_sd_card_emulate(struct sdhci_host *host, int insert)
 {

diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 8424839660f844b748f7960a46a5e9cf5df88e56..45c7f25dac748e638018d3b0293c169b8e86c48e 100644 (file)
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -39,7 +39,7 @@ static irqreturn_t sdhci_dove_carddetect_irq(int irq, void *data)
 {
        struct sdhci_host *host = data;
 
-       tasklet_schedule(&host->card_tasklet);
+       schedule_schedule(&host->card_detect_work);
        return IRQ_HANDLED;
 }
 
@@ -149,8 +149,8 @@ static int sdhci_dove_probe(struct platform_device *pdev)
                goto err_sdhci_add;
 
        /*
-        * We must request the IRQ after sdhci_add_host(), as the tasklet only
-        * gets setup in sdhci_add_host() and we oops.
+        * We must request the IRQ after sdhci_add_host(), as the workqueue
+        * only gets setup in sdhci_add_host() and we oops.
         */
        if (gpio_is_valid(priv->gpio_cd)) {
                ret = request_irq(gpio_to_irq(priv->gpio_cd),

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 6debda9521556c530d141cb3fa898af4175a6286..2a4d843c32891b30bbb459c456590b06acf33daf 100644 (file)
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -395,7 +395,7 @@ static void sdhci_s3c_notify_change(struct platform_device *dev, int state)
                        clk_disable_unprepare(sc->clk_io);
 #endif
                }
-               tasklet_schedule(&host->card_tasklet);
+               schedule_work(&host->card_detect_work);
                spin_unlock_irqrestore(&host->lock, flags);
        }
 }

diff --git a/drivers/mmc/host/sdhci-sirf.c b/drivers/mmc/host/sdhci-sirf.c
index 696122c1b468b315968128fb5a414fee21c740bd..4ec2ea3cd217f0302fbc7369002109f6b3585291 100644 (file)
--- a/drivers/mmc/host/sdhci-sirf.c
+++ b/drivers/mmc/host/sdhci-sirf.c
@@ -80,8 +80,8 @@ static int sdhci_sirf_probe(struct platform_device *pdev)
                goto err_sdhci_add;
 
        /*
-        * We must request the IRQ after sdhci_add_host(), as the tasklet only
-        * gets setup in sdhci_add_host() and we oops.
+        * We must request the IRQ after sdhci_add_host(), as the workqueue
+        * only gets setup in sdhci_add_host() and we oops.
         */
        if (gpio_is_valid(priv->gpio_cd)) {
                ret = mmc_gpio_request_cd(host->mmc, priv->gpio_cd, 0);

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 2dba9f8d1760313e3c47eeca756d6a59247ed924..9b6459da7b1cd480620cb3c760c8f72ea61a7e45 100644 (file)
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -65,7 +65,7 @@ static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id)
        }
 
        /* inform sdhci driver about card insertion/removal */
-       tasklet_schedule(&host->card_tasklet);
+       schedule_work(&host->card_detect_work);
 
        return IRQ_HANDLED;
 }

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index f1680b80441a682a8ef0994ea7601062ba1a0c6f..53befafe8ff8efe0404559067af0e36a43c80500 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -978,7 +978,7 @@ static void sdhci_finish_data(struct sdhci_host *host)
 
                sdhci_send_command(host, data->stop);
        } else
-               tasklet_schedule(&host->finish_tasklet);
+               schedule_work(&host->finish_work);
 }
 
 void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
@@ -1007,7 +1007,7 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
                                "inhibit bit(s).\n", mmc_hostname(host->mmc));
                        sdhci_dumpregs(host);
                        cmd->error = -EIO;
-                       tasklet_schedule(&host->finish_tasklet);
+                       schedule_work(&host->finish_work);
                        return;
                }
                timeout--;
@@ -1028,7 +1028,7 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
                pr_err("%s: Unsupported response type!\n",
                        mmc_hostname(host->mmc));
                cmd->error = -EINVAL;
-               tasklet_schedule(&host->finish_tasklet);
+               schedule_work(&host->finish_work);
                return;
        }
 
@@ -1090,7 +1090,7 @@ static void sdhci_finish_command(struct sdhci_host *host)
                        sdhci_finish_data(host);
 
                if (!host->cmd->data)
-                       tasklet_schedule(&host->finish_tasklet);
+                       schedule_work(&host->finish_work);
 
                host->cmd = NULL;
        }
@@ -1374,7 +1374,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
        if (!present || host->flags & SDHCI_DEVICE_DEAD) {
                host->mrq->cmd->error = -ENOMEDIUM;
-               tasklet_schedule(&host->finish_tasklet);
+               schedule_work(&host->finish_work);
        } else {
                u32 present_state;
 
@@ -2091,7 +2091,7 @@ static void sdhci_card_event(struct mmc_host *mmc)
                sdhci_reset(host, SDHCI_RESET_DATA);
 
                host->mrq->cmd->error = -ENOMEDIUM;
-               tasklet_schedule(&host->finish_tasklet);
+               schedule_work(&host->finish_work);
        }
 
        spin_unlock_irqrestore(&host->lock, flags);
@@ -2116,29 +2116,30 @@ static const struct mmc_host_ops sdhci_ops = {
  *                                                                           *
 \*****************************************************************************/
 
-static void sdhci_tasklet_card(unsigned long param)
+static void sdhci_card_detect_work(struct work_struct *wk)
 {
-       struct sdhci_host *host = (struct sdhci_host*)param;
+       struct sdhci_host *host = container_of(wk, struct sdhci_host,
+                                                  card_detect_work);
 
        sdhci_card_event(host->mmc);
 
        mmc_detect_change(host->mmc, msecs_to_jiffies(200));
 }
 
-static void sdhci_tasklet_finish(unsigned long param)
+static void sdhci_finish_work(struct work_struct *wk)
 {
        struct sdhci_host *host;
        unsigned long flags;
        struct mmc_request *mrq;
 
-       host = (struct sdhci_host*)param;
+       host = container_of(wk, struct sdhci_host, finish_work);
 
        spin_lock_irqsave(&host->lock, flags);
 
-        /*
-         * If this tasklet gets rescheduled while running, it will
-         * be run again afterwards but without any active request.
-         */
+       /*
+        * If this work gets rescheduled while running, it will
+        * be run again afterwards but without any active request.
+        */
        if (!host->mrq) {
                spin_unlock_irqrestore(&host->lock, flags);
                return;
@@ -2207,7 +2208,7 @@ static void sdhci_timeout_work(struct work_struct *wk)
                        else
                                host->mrq->cmd->error = -ETIMEDOUT;
 
-                       tasklet_schedule(&host->finish_tasklet);
+                       schedule_work(&host->finish_work);
                }
        }
 
@@ -2254,7 +2255,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)
                host->cmd->error = -EILSEQ;
 
        if (host->cmd->error) {
-               tasklet_schedule(&host->finish_tasklet);
+               schedule_work(&host->finish_work);
                return;
        }
 
@@ -2463,7 +2464,7 @@ again:
                sdhci_writel(host, intmask & (SDHCI_INT_CARD_INSERT |
                             SDHCI_INT_CARD_REMOVE), SDHCI_INT_STATUS);
                intmask &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE);
-               tasklet_schedule(&host->card_tasklet);
+               schedule_work(&host->card_detect_work);
        }
 
        if (intmask & SDHCI_INT_CMD_MASK) {
@@ -3210,12 +3211,10 @@ int sdhci_add_host(struct sdhci_host *host)
        mmc->max_blk_count = (host->quirks & SDHCI_QUIRK_NO_MULTIBLOCK) ? 1 : 65535;
 
        /*
-        * Init tasklets.
+        * Init work structs.
         */
-       tasklet_init(&host->card_tasklet,
-               sdhci_tasklet_card, (unsigned long)host);
-       tasklet_init(&host->finish_tasklet,
-               sdhci_tasklet_finish, (unsigned long)host);
+       INIT_WORK(&host->card_detect_work, sdhci_card_detect_work);
+       INIT_WORK(&host->finish_work, sdhci_finish_work);
 
        INIT_DELAYED_WORK(&host->timeout_work, sdhci_timeout_work);
 
@@ -3234,7 +3233,7 @@ int sdhci_add_host(struct sdhci_host *host)
        if (ret) {
                pr_err("%s: Failed to request IRQ %d: %d\n",
                       mmc_hostname(mmc), host->irq, ret);
-               goto untasklet;
+               return ret;
        }
 
 #ifdef CONFIG_MMC_DEBUG
@@ -3276,10 +3275,6 @@ reset:
        sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK);
        free_irq(host->irq, host);
 #endif
-untasklet:
-       tasklet_kill(&host->card_tasklet);
-       tasklet_kill(&host->finish_tasklet);
-
        return ret;
 }
 
@@ -3299,7 +3294,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)
                                " transfer!\n", mmc_hostname(host->mmc));
 
                        host->mrq->cmd->error = -ENOMEDIUM;
-                       tasklet_schedule(&host->finish_tasklet);
+                       schedule_work(&host->finish_work);
                }
 
                spin_unlock_irqrestore(&host->lock, flags);
@@ -3321,8 +3316,8 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)
 
        flush_delayed_work(&host->timeout_work);
 
-       tasklet_kill(&host->card_tasklet);
-       tasklet_kill(&host->finish_tasklet);
+       flush_work(&host->card_detect_work);
+       flush_work(&host->finish_work);
 
        if (host->vmmc) {
                regulator_disable(host->vmmc);

diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 2b0f4f305249f730c77cc6c89dd6d256ad9d6c82..05cd76c9a9aacec36a049eb560e5eb82b240788c 100644 (file)
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -161,8 +161,8 @@ struct sdhci_host {
        dma_addr_t adma_addr;   /* Mapped ADMA descr. table */
        dma_addr_t align_addr;  /* Mapped bounce buffer */
 
-       struct tasklet_struct card_tasklet;     /* Tasklet structures */
-       struct tasklet_struct finish_tasklet;
+       struct work_struct      card_detect_work;
+       struct work_struct      finish_work;
 
        struct delayed_work     timeout_work;   /* Work for timeouts */