mmc: core: Switch to basic workqueue API for sdio_irq_work
PATCH 1/1 mmc: core: Switch to basic workqueue API for sdio_irq_work
The delay parameter isn't set by any user, therefore simplify the code and switch to the basic workqueue API w/o delay support. This also reduces the size of struct mmc_host.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/mmc/core/host.c | 2 +- drivers/mmc/core/sdio.c | 4 ++-- drivers/mmc/core/sdio_irq.c | 4 ++-- include/linux/mmc/host.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/mmc/core/host.c +1 -1
@@ -565,7 +565,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)spin_lock_init (&host->lock);init_waitqueue_head (&host->wq);INIT_DELAYED_WORK (&host->detect, mmc_rescan); -INIT_DELAYED_WORK (&host->sdio_irq_work, sdio_irq_work); +INIT_WORK (&host->sdio_irq_work, sdio_irq_work);timer_setup (&host->retune_timer, mmc_retune_timer,0 );/*
drivers/mmc/core/sdio.c +2 -2
@@ -1043,7 +1043,7 @@ static int mmc_sdio_suspend(struct mmc_host *host)/* Prevent processing of SDIO IRQs in suspended state. */ mmc_card_set_suspended (host->card); -cancel_delayed_work_sync (&host->sdio_irq_work); +cancel_work_sync (&host->sdio_irq_work);mmc_claim_host (host);
@@ -1103,7 +1103,7 @@ static int mmc_sdio_resume(struct mmc_host *host)if (!(host->caps2 &MMC_CAP2_SDIO_IRQ_NOTHREAD ))wake_up_process (host->sdio_irq_thread);else if (host->caps &MMC_CAP_SDIO_IRQ ) -queue_delayed_work (system_wq, &host->sdio_irq_work,0 ); +schedule_work (&host->sdio_irq_work); } out:
drivers/mmc/core/sdio_irq.c +2 -2
@@ -124,7 +124,7 @@ static void sdio_run_irqs(struct mmc_host *host)void sdio_irq_work (struct work_struct *work) {struct mmc_host *host = - container_of(work, struct mmc_host, sdio_irq_work.work); + container_of(work, struct mmc_host, sdio_irq_work);sdio_run_irqs (host); }
@@ -132,7 +132,7 @@ void sdio_irq_work(struct work_struct *work)void sdio_signal_irq (struct mmc_host *host) { host->sdio_irq_pending = true; -queue_delayed_work (system_wq, &host->sdio_irq_work,0 ); +schedule_work (&host->sdio_irq_work); }EXPORT_SYMBOL_GPL (sdio_signal_irq);
include/linux/mmc/host.h +1 -1
@@ -476,7 +476,7 @@ struct mmc_host {unsigned int sdio_irqs;struct task_struct *sdio_irq_thread; -struct delayed_work sdio_irq_work; +struct work_struct sdio_irq_work;bool sdio_irq_pending;atomic_t sdio_irq_thread_abort;
Signature · 1 line
2.37.2
Quoted 6 lines · Heiner Kallweit
The delay parameter isn't set by any user, therefore simplify the code and switch to the basic workqueue API w/o delay support. This also reduces the size of struct
mmc_host.Signed-off-by Heiner Kallweit <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 80 lines
--- drivers/mmc/core/host.c | 2 +- drivers/mmc/core/sdio.c | 4 ++-- drivers/mmc/core/sdio_irq.c | 4 ++-- include/linux/mmc/host.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)drivers/mmc/core/host.c +1
-1@@ -565,7 +565,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)spin_lock_init (&host->lock);init_waitqueue_head (&host->wq);INIT_DELAYED_WORK (&host->detect, mmc_rescan); -INIT_DELAYED_WORK (&host->sdio_irq_work, sdio_irq_work); +INIT_WORK (&host->sdio_irq_work, sdio_irq_work);timer_setup (&host->retune_timer, mmc_retune_timer,0 );/* drivers/mmc/core/sdio.c +2
-2@@ -1043,7 +1043,7 @@ static int mmc_sdio_suspend(struct mmc_host *host)/* Prevent processing of SDIO IRQs in suspended state. */ mmc_card_set_suspended (host->card); -cancel_delayed_work_sync (&host->sdio_irq_work); +cancel_work_sync (&host->sdio_irq_work);mmc_claim_host (host);@@ -1103,7 +1103,7 @@ static int mmc_sdio_resume(struct mmc_host *host)if (!(host->caps2 &MMC_CAP2_SDIO_IRQ_NOTHREAD ))wake_up_process (host->sdio_irq_thread);else if (host->caps &MMC_CAP_SDIO_IRQ ) -queue_delayed_work (system_wq, &host->sdio_irq_work,0 ); +schedule_work (&host->sdio_irq_work); } out:drivers/mmc/core/sdio_irq.c +2
-2@@ -124,7 +124,7 @@ static void sdio_run_irqs(struct mmc_host *host)void sdio_irq_work (struct work_struct *work) {struct mmc_host *host = - container_of(work, struct mmc_host, sdio_irq_work.work); + container_of(work, struct mmc_host, sdio_irq_work);sdio_run_irqs (host); }@@ -132,7 +132,7 @@ void sdio_irq_work(struct work_struct *work)void sdio_signal_irq (struct mmc_host *host) { host->sdio_irq_pending = true; -queue_delayed_work (system_wq, &host->sdio_irq_work,0 ); +schedule_work (&host->sdio_irq_work); }EXPORT_SYMBOL_GPL (sdio_signal_irq);include/linux/mmc/host.h +1
-2@@ -476,7 +476,7 @@ struct mmc_host {unsigned int sdio_irqs;struct task_struct *sdio_irq_thread; -struct delayed_work sdio_irq_work; +struct work_struct sdio_irq_work;bool sdio_irq_pending;atomic_t sdio_irq_thread_abort; --2.37.2