mmc: convert tasklets to use new tasklet_setup()
Subsystems (10)
cover mmc: convert tasklets to use new tasklet_setup()
Commit 12cc923f1ccc ("tasklet: Introduce new initialization API")' introduced a new tasklet initialization API. This series converts all the mmc drivers to use the new tasklet_setup() API
Allen Pais (10):
mmc: atmel-mci: convert tasklets to use new tasklet_setup() API
mmc: au1xmmc: convert tasklets to use new tasklet_setup() API
mmc: cb710: convert tasklets to use new tasklet_setup() API
mmc: dw_mmc: convert tasklets to use new tasklet_setup() API
mmc: omap: convert tasklets to use new tasklet_setup() API
mmc: renesas: convert tasklets to use new tasklet_setup() API
mmc: s3cmci: convert tasklets to use new tasklet_setup() API
mmc: tifm_sd: convert tasklets to use new tasklet_setup() API
mmc: uniphier: convert tasklets to use new tasklet_setup() API
mmc: via-sdmmc: convert tasklets to use new tasklet_setup() API
drivers/mmc/host/atmel-mci.c | 6 +++--- drivers/mmc/host/au1xmmc.c | 15 ++++++-------- drivers/mmc/host/cb710-mmc.c | 11 +++++----- drivers/mmc/host/dw_mmc.c | 6 +++--- drivers/mmc/host/omap.c | 7 +++---- drivers/mmc/host/renesas_sdhi.h | 1 + drivers/mmc/host/renesas_sdhi_core.c | 2 ++ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 20 +++++++++---------- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 9 ++++----- drivers/mmc/host/s3cmci.c | 6 +++--- drivers/mmc/host/tifm_sd.c | 7 +++---- drivers/mmc/host/uniphier-sd.c | 14 ++++++------- drivers/mmc/host/via-sdmmc.c | 7 +++---- 13 files changed, 53 insertions(+), 58 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/10 mmc: atmel-mci: convert tasklets to use new tasklet_setup() API
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/atmel-mci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/host/atmel-mci.c +3 -3
@@ -1719,9 +1719,9 @@ static void atmci_detect_change(struct timer_list *t) } } -static void atmci_tasklet_func (unsigned long priv) +static void atmci_tasklet_func (struct tasklet_struct *t) { -struct atmel_mci *host = (struct atmel_mci *)priv; +struct atmel_mci *host =from_tasklet (host, t, tasklet);struct mmc_request *mrq = host->mrq;struct mmc_data *data = host->data;enum atmel_mci_state state = host->state;
@@ -2496,7 +2496,7 @@ static int atmci_probe(struct platform_device *pdev) host->mapbase = regs->start; -tasklet_init (&host->tasklet, atmci_tasklet_func, (unsigned long )host); +tasklet_setup (&host->tasklet, atmci_tasklet_func); ret =request_irq (irq, atmci_interrupt,0 ,dev_name (&pdev->dev), host);if (ret) {
Signature · 1 line
2.17.1
PATCH 2/10 mmc: au1xmmc: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/au1xmmc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/mmc/host/au1xmmc.c +6 -9
@@ -253,9 +253,9 @@ static void au1xmmc_finish_request(struct au1xmmc_host *host)mmc_request_done (host->mmc, mrq); } -static void au1xmmc_tasklet_finish (unsigned long param) +static void au1xmmc_tasklet_finish (struct tasklet_struct *t) { -struct au1xmmc_host *host = (struct au1xmmc_host *) param; +struct au1xmmc_host *host =from_tasklet (host, t, finish_task);au1xmmc_finish_request (host); }
@@ -363,9 +363,9 @@ static void au1xmmc_data_complete(struct au1xmmc_host *host, u32 status)au1xmmc_finish_request (host); } -static void au1xmmc_tasklet_data (unsigned long param) +static void au1xmmc_tasklet_data (struct tasklet_struct *t) { -struct au1xmmc_host *host = (struct au1xmmc_host *)param; +struct au1xmmc_host *host =from_tasklet (host, t, data_task);u32 status =__raw_readl (HOST_STATUS (host));au1xmmc_data_complete (host, status);
@@ -1037,11 +1037,8 @@ static int au1xmmc_probe(struct platform_device *pdev)if (host->platdata) mmc->caps &= ~(host->platdata->mask_host_caps); -tasklet_init (&host->data_task, au1xmmc_tasklet_data, - (unsigned long )host); - -tasklet_init (&host->finish_task, au1xmmc_tasklet_finish, - (unsigned long )host); +tasklet_setup (&host->data_task, au1xmmc_tasklet_data); +tasklet_setup (&host->finish_task, au1xmmc_tasklet_finish);if (has_dbdma ()) { ret =au1xmmc_dbdma_init (host);
Signature · 1 line
2.17.1
PATCH 3/10 mmc: cb710: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/cb710-mmc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/mmc/host/cb710-mmc.c +6 -5
@@ -646,11 +646,12 @@ static int cb710_mmc_irq_handler(struct cb710_slot *slot)return 1 ; } -static void cb710_mmc_finish_request_tasklet (unsigned long data) +static void cb710_mmc_finish_request_tasklet (struct tasklet_struct *t) { -struct mmc_host *mmc = (void *)data; -struct cb710_mmc_reader *reader =mmc_priv (mmc); +struct cb710_mmc_reader *reader =from_tasklet (reader, t, + finish_req_tasklet);struct mmc_request *mrq = reader->mrq; +struct mmc_host *mmc = mrq->host; reader->mrq =NULL ;mmc_request_done (mmc, mrq);
@@ -718,8 +719,8 @@ static int cb710_mmc_init(struct platform_device *pdev) reader =mmc_priv (mmc); -tasklet_init (&reader->finish_req_tasklet, - cb710_mmc_finish_request_tasklet, (unsigned long )mmc); +tasklet_setup (&reader->finish_req_tasklet, + cb710_mmc_finish_request_tasklet);spin_lock_init (&reader->irq_lock);cb710_dump_regs (chip,CB710_DUMP_REGS_MMC );
Signature · 1 line
2.17.1
PATCH 4/10 mmc: dw_mmc: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/dw_mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/host/dw_mmc.c +3 -3
@@ -1952,9 +1952,9 @@ static bool dw_mci_clear_pending_data_complete(struct dw_mci *host)return true; } -static void dw_mci_tasklet_func (unsigned long priv) +static void dw_mci_tasklet_func (struct tasklet_struct *t) { -struct dw_mci *host = (struct dw_mci *)priv; +struct dw_mci *host =from_tasklet (host, t, tasklet);struct mmc_data *data;struct mmc_command *cmd;struct mmc_request *mrq;
@@ -3312,7 +3312,7 @@ int dw_mci_probe(struct dw_mci *host)else host->fifo_reg = host->regs +DATA_240A_OFFSET ; -tasklet_init (&host->tasklet, dw_mci_tasklet_func, (unsigned long )host); +tasklet_setup (&host->tasklet, dw_mci_tasklet_func); ret =devm_request_irq (host->dev, host->irq, dw_mci_interrupt, host->irq_flags,"dw-mci" , host);if (ret)
Signature · 1 line
2.17.1
PATCH 5/10 mmc: omap: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/omap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/mmc/host/omap.c +3 -4
@@ -878,9 +878,9 @@ static void mmc_omap_cover_timer(struct timer_list *t)tasklet_schedule (&slot->cover_tasklet); } -static void mmc_omap_cover_handler (unsigned long param) +static void mmc_omap_cover_handler (struct tasklet_struct *t) { -struct mmc_omap_slot *slot = (struct mmc_omap_slot *)param; +struct mmc_omap_slot *slot =from_tasklet (slot, t, cover_tasklet);int cover_open =mmc_omap_cover_is_open (slot);mmc_detect_change (slot->mmc,0 );
@@ -1269,8 +1269,7 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)if (slot->pdata->get_cover_state !=NULL ) {timer_setup (&slot->cover_timer, mmc_omap_cover_timer,0 ); -tasklet_init (&slot->cover_tasklet, mmc_omap_cover_handler, - (unsigned long )slot); +tasklet_setup (&slot->cover_tasklet, mmc_omap_cover_handler); } r =mmc_add_host (mmc);
Signature · 1 line
2.17.1
PATCH 6/10 mmc: renesas: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/renesas_sdhi.h | 1 + drivers/mmc/host/renesas_sdhi_core.c | 2 ++ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 20 +++++++++---------- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 9 ++++----- 4 files changed, 17 insertions(+), 15 deletions(-)
drivers/mmc/host/renesas_sdhi.h +1 -0
@@ -48,6 +48,7 @@ struct tmio_mmc_dma { };struct renesas_sdhi { +struct platform_device *pdev;struct clk *clk;struct clk *clk_cd;struct tmio_mmc_data mmc_data;
drivers/mmc/host/renesas_sdhi_core.c +2 -0
@@ -975,6 +975,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, goto eirq; } + priv->pdev = pdev; +dev_info (&pdev->dev,"%s base at %pa, max clock rate %u MHz\n" ,mmc_hostname (host->mmc), &res->start, host->mmc->f_max /1000000 );
drivers/mmc/host/renesas_sdhi_internal_dmac.c +10 -10
@@ -218,9 +218,9 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,renesas_sdhi_internal_dmac_enable_dma (host, false); } -static void renesas_sdhi_internal_dmac_issue_tasklet_fn (unsigned long arg) +static void renesas_sdhi_internal_dmac_issue_tasklet_fn (struct tasklet_struct *t) { -struct tmio_mmc_host *host = (struct tmio_mmc_host *)arg; +struct tmio_mmc_host *host =from_tasklet (host, t, dma_issue);tmio_mmc_enable_mmc_irqs (host,TMIO_STAT_DATAEND );
@@ -255,9 +255,11 @@ static bool renesas_sdhi_internal_dmac_complete(struct tmio_mmc_host *host)return true; } -static void renesas_sdhi_internal_dmac_complete_tasklet_fn (unsigned long arg) +static void renesas_sdhi_internal_dmac_complete_tasklet_fn (struct tasklet_struct *t) { -struct tmio_mmc_host *host = (struct tmio_mmc_host *)arg; +struct renesas_sdhi *priv =from_tasklet (priv, t, + dma_priv.dma_complete); +struct tmio_mmc_host *host =platform_get_drvdata (priv->pdev);spin_lock_irq (&host->lock);if (!renesas_sdhi_internal_dmac_complete (host))
@@ -289,12 +291,10 @@ renesas_sdhi_internal_dmac_request_dma(struct tmio_mmc_host *host,/* Each value is set to non-zero to assume "enabling" each DMA */ host->chan_rx = host->chan_tx = (void *)0xdeadbeaf ; -tasklet_init (&priv->dma_priv.dma_complete, - renesas_sdhi_internal_dmac_complete_tasklet_fn, - (unsigned long )host); -tasklet_init (&host->dma_issue, - renesas_sdhi_internal_dmac_issue_tasklet_fn, - (unsigned long )host); +tasklet_setup (&priv->dma_priv.dma_complete, + renesas_sdhi_internal_dmac_complete_tasklet_fn); +tasklet_setup (&host->dma_issue, + renesas_sdhi_internal_dmac_issue_tasklet_fn); } static void
drivers/mmc/host/renesas_sdhi_sys_dmac.c +4 -5
@@ -310,9 +310,9 @@ static void renesas_sdhi_sys_dmac_start_dma(struct tmio_mmc_host *host, } } -static void renesas_sdhi_sys_dmac_issue_tasklet_fn (unsigned long priv) +static void renesas_sdhi_sys_dmac_issue_tasklet_fn (struct tasklet_struct *t) { -struct tmio_mmc_host *host = (struct tmio_mmc_host *)priv; +struct tmio_mmc_host *host =from_tasklet (host, t, dma_issue);struct dma_chan *chan =NULL ;spin_lock_irq (&host->lock);
@@ -399,9 +399,8 @@ static void renesas_sdhi_sys_dmac_request_dma(struct tmio_mmc_host *host, goto ebouncebuf;init_completion (&priv->dma_priv.dma_dataend); -tasklet_init (&host->dma_issue, - renesas_sdhi_sys_dmac_issue_tasklet_fn, - (unsigned long )host); +tasklet_setup (&host->dma_issue, + renesas_sdhi_sys_dmac_issue_tasklet_fn); }renesas_sdhi_sys_dmac_enable_dma (host, true);
Signature · 1 line
2.17.1
PATCH 7/10 mmc: s3cmci: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/s3cmci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/host/s3cmci.c +3 -3
@@ -549,9 +549,9 @@ static void do_pio_write(struct s3cmci_host *host)enable_imask (host,S3C2410_SDIIMSK_TXFIFOHALF ); } -static void pio_tasklet (unsigned long data) +static void pio_tasklet (struct tasklet_struct *t) { -struct s3cmci_host *host = (struct s3cmci_host *) data; +struct s3cmci_host *host =from_tasklet (host, t, pio_tasklet);s3cmci_disable_irq (host, true);
@@ -1565,7 +1565,7 @@ static int s3cmci_probe(struct platform_device *pdev) host->pdata = pdev->dev.platform_data;spin_lock_init (&host->complete_lock); -tasklet_init (&host->pio_tasklet, pio_tasklet, (unsigned long ) host); +tasklet_setup (&host->pio_tasklet, pio_tasklet);if (host->is2440) { host->sdiimsk =S3C2440_SDIIMSK ;
Signature · 1 line
2.17.1
PATCH 8/10 mmc: tifm_sd: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/tifm_sd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/mmc/host/tifm_sd.c +3 -4
@@ -731,9 +731,9 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)mmc_request_done (mmc, mrq); } -static void tifm_sd_end_cmd (unsigned long data) +static void tifm_sd_end_cmd (struct tasklet_struct *t) { -struct tifm_sd *host = (struct tifm_sd *)data; +struct tifm_sd *host =from_tasklet (host, t, finish_tasklet);struct tifm_dev *sock = host->dev;struct mmc_host *mmc =tifm_get_drvdata (sock);struct mmc_request *mrq;
@@ -968,8 +968,7 @@ static int tifm_sd_probe(struct tifm_dev *sock)*/ mmc->max_busy_timeout =TIFM_MMCSD_REQ_TIMEOUT_MS ; -tasklet_init (&host->finish_tasklet, tifm_sd_end_cmd, - (unsigned long )host); +tasklet_setup (&host->finish_tasklet, tifm_sd_end_cmd);timer_setup (&host->timer, tifm_sd_abort,0 ); mmc->ops = &tifm_sd_ops;
Signature · 1 line
2.17.1
PATCH 9/10 mmc: uniphier: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisIn preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- drivers/mmc/host/uniphier-sd.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/mmc/host/uniphier-sd.c +6 -8
@@ -81,9 +81,9 @@ static void uniphier_sd_dma_endisable(struct tmio_mmc_host *host, int enable) }/* external DMA engine */ -static void uniphier_sd_external_dma_issue (unsigned long arg) +static void uniphier_sd_external_dma_issue (struct tasklet_struct *t) { -struct tmio_mmc_host *host = (void *)arg; +struct tmio_mmc_host *host =from_tasklet (host, t, dma_issue);struct uniphier_sd_priv *priv =uniphier_sd_priv (host);uniphier_sd_dma_endisable (host,1 );
@@ -190,8 +190,7 @@ static void uniphier_sd_external_dma_request(struct tmio_mmc_host *host, host->chan_rx = chan; host->chan_tx = chan; -tasklet_init (&host->dma_issue, uniphier_sd_external_dma_issue, - (unsigned long )host); +tasklet_setup (&host->dma_issue, uniphier_sd_external_dma_issue); }static void uniphier_sd_external_dma_release (struct tmio_mmc_host *host)
@@ -228,9 +227,9 @@ static const struct tmio_mmc_dma_ops uniphier_sd_external_dma_ops = { .dataend = uniphier_sd_external_dma_dataend, }; -static void uniphier_sd_internal_dma_issue (unsigned long arg) +static void uniphier_sd_internal_dma_issue (struct tasklet_struct *t) { -struct tmio_mmc_host *host = (void *)arg; +struct tmio_mmc_host *host =from_tasklet (host, t, dma_issue);unsigned long flags;spin_lock_irqsave (&host->lock, flags);
@@ -309,8 +308,7 @@ static void uniphier_sd_internal_dma_request(struct tmio_mmc_host *host, host->chan_tx = (void *)0xdeadbeaf ; -tasklet_init (&host->dma_issue, uniphier_sd_internal_dma_issue, - (unsigned long )host); +tasklet_setup (&host->dma_issue, uniphier_sd_internal_dma_issue); }static void uniphier_sd_internal_dma_release (struct tmio_mmc_host *host)
Signature · 1 line
2.17.1
Quoted 4 lines · Allen Pais
Commit
12cc923f1ccc("tasklet: Introduce new initialization API")' introduced a new tasklet initialization API. This series converts all the mmc drivers to use the newtasklet_setup()API
I did not know this was the direction to invest efforts because I thought the threaded-irq was supposed to replace the tasklet.
Quoted 27 lines
Allen Pais (10):
mmc: atmel-mci: convert tasklets to use newtasklet_setup()API
mmc: au1xmmc: convert tasklets to use newtasklet_setup()API
mmc: cb710: convert tasklets to use newtasklet_setup()API
mmc:dw_mmc: convert tasklets to use newtasklet_setup()API
mmc: omap: convert tasklets to use newtasklet_setup()API
mmc: renesas: convert tasklets to use newtasklet_setup()API
mmc: s3cmci: convert tasklets to use newtasklet_setup()API
mmc:tifm_sd: convert tasklets to use newtasklet_setup()API
mmc: uniphier: convert tasklets to use newtasklet_setup()API
mmc: via-sdmmc: convert tasklets to use newtasklet_setup()APIdrivers/mmc/host/atmel-mci.c | 6 +++--- drivers/mmc/host/au1xmmc.c | 15 ++++++-------- drivers/mmc/host/cb710-mmc.c | 11 +++++----- drivers/mmc/host/dw_mmc.c | 6 +++--- drivers/mmc/host/omap.c | 7 +++---- drivers/mmc/host/renesas_sdhi.h | 1 + drivers/mmc/host/renesas_sdhi_core.c | 2 ++ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 20 +++++++++---------- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 9 ++++----- drivers/mmc/host/s3cmci.c | 6 +++--- drivers/mmc/host/tifm_sd.c | 7 +++---- drivers/mmc/host/uniphier-sd.c | 14 ++++++------- drivers/mmc/host/via-sdmmc.c | 7 +++---- 13 files changed, 53 insertions(+), 58 deletions(-)
Quoted 3 lines
--
2.17.1
--
Best Regards
Masahiro Yamada
Quoted 10 lines · Masahiro Yamada
Quoted 4 lines · Allen Pais
Commit
12cc923f1ccc("tasklet: Introduce new initialization API")' introduced a new tasklet initialization API. This series converts all the mmc drivers to use the newtasklet_setup()APII did not know this was the direction to invest efforts because I thought the threaded-irq was supposed to replace the tasklet.
Both can happen. It seemed to me that mechanical conversions from tasklet to threaded-irq was not possible, though, so best to convert the old API away from being a exploit target (saved arguments on the heap) while conversions to threaded-irq can happen on a case-by-case basis.
Signature · 1 line
Kees Cook