mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
mmc: dw_mmc: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Jaehoon Chung <jh80.chung@samsung.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: linux-mmc@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
93c23ae385
commit
379777297c
1 changed files with 9 additions and 14 deletions
|
@ -2991,9 +2991,9 @@ static void dw_mci_init_dma(struct dw_mci *host)
|
||||||
host->use_dma = TRANS_MODE_PIO;
|
host->use_dma = TRANS_MODE_PIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dw_mci_cmd11_timer(unsigned long arg)
|
static void dw_mci_cmd11_timer(struct timer_list *t)
|
||||||
{
|
{
|
||||||
struct dw_mci *host = (struct dw_mci *)arg;
|
struct dw_mci *host = from_timer(host, t, cmd11_timer);
|
||||||
|
|
||||||
if (host->state != STATE_SENDING_CMD11) {
|
if (host->state != STATE_SENDING_CMD11) {
|
||||||
dev_warn(host->dev, "Unexpected CMD11 timeout\n");
|
dev_warn(host->dev, "Unexpected CMD11 timeout\n");
|
||||||
|
@ -3005,9 +3005,9 @@ static void dw_mci_cmd11_timer(unsigned long arg)
|
||||||
tasklet_schedule(&host->tasklet);
|
tasklet_schedule(&host->tasklet);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dw_mci_cto_timer(unsigned long arg)
|
static void dw_mci_cto_timer(struct timer_list *t)
|
||||||
{
|
{
|
||||||
struct dw_mci *host = (struct dw_mci *)arg;
|
struct dw_mci *host = from_timer(host, t, cto_timer);
|
||||||
unsigned long irqflags;
|
unsigned long irqflags;
|
||||||
u32 pending;
|
u32 pending;
|
||||||
|
|
||||||
|
@ -3060,9 +3060,9 @@ static void dw_mci_cto_timer(unsigned long arg)
|
||||||
spin_unlock_irqrestore(&host->irq_lock, irqflags);
|
spin_unlock_irqrestore(&host->irq_lock, irqflags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dw_mci_dto_timer(unsigned long arg)
|
static void dw_mci_dto_timer(struct timer_list *t)
|
||||||
{
|
{
|
||||||
struct dw_mci *host = (struct dw_mci *)arg;
|
struct dw_mci *host = from_timer(host, t, dto_timer);
|
||||||
unsigned long irqflags;
|
unsigned long irqflags;
|
||||||
u32 pending;
|
u32 pending;
|
||||||
|
|
||||||
|
@ -3257,14 +3257,9 @@ int dw_mci_probe(struct dw_mci *host)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_timer(&host->cmd11_timer,
|
timer_setup(&host->cmd11_timer, dw_mci_cmd11_timer, 0);
|
||||||
dw_mci_cmd11_timer, (unsigned long)host);
|
timer_setup(&host->cto_timer, dw_mci_cto_timer, 0);
|
||||||
|
timer_setup(&host->dto_timer, dw_mci_dto_timer, 0);
|
||||||
setup_timer(&host->cto_timer,
|
|
||||||
dw_mci_cto_timer, (unsigned long)host);
|
|
||||||
|
|
||||||
setup_timer(&host->dto_timer,
|
|
||||||
dw_mci_dto_timer, (unsigned long)host);
|
|
||||||
|
|
||||||
spin_lock_init(&host->lock);
|
spin_lock_init(&host->lock);
|
||||||
spin_lock_init(&host->irq_lock);
|
spin_lock_init(&host->irq_lock);
|
||||||
|
|
Loading…
Reference in a new issue