diff options
| author | Kees Cook | 2017-10-18 06:10:19 +0200 |
|---|---|---|
| committer | Kees Cook | 2017-11-22 00:46:44 +0100 |
| commit | 87c1d2d373c2dfc9993f09c3cfd69cf2c3347b20 (patch) | |
| tree | 833d43300400de30c1eb041d3faf3e19e5fd9415 /drivers/lightnvm/pblk-core.c | |
| parent | drivers/net: cris: Convert timers to use timer_setup() (diff) | |
| download | kernel-qcow2-linux-87c1d2d373c2dfc9993f09c3cfd69cf2c3347b20.tar.gz kernel-qcow2-linux-87c1d2d373c2dfc9993f09c3cfd69cf2c3347b20.tar.xz kernel-qcow2-linux-87c1d2d373c2dfc9993f09c3cfd69cf2c3347b20.zip | |
lightnvm: 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: Matias Bjorling <mb@lightnvm.io>
Cc: linux-block@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/lightnvm/pblk-core.c')
| -rw-r--r-- | drivers/lightnvm/pblk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index ce90213a42fa..76516ee84e9a 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -270,9 +270,9 @@ static void pblk_write_kick(struct pblk *pblk) mod_timer(&pblk->wtimer, jiffies + msecs_to_jiffies(1000)); } -void pblk_write_timer_fn(unsigned long data) +void pblk_write_timer_fn(struct timer_list *t) { - struct pblk *pblk = (struct pblk *)data; + struct pblk *pblk = from_timer(pblk, t, wtimer); /* kick the write thread every tick to flush outstanding data */ pblk_write_kick(pblk); |