aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-17 21:06:32 -0700
committerKees Cook <keescook@chromium.org>2017-11-06 12:50:03 -0800
commit10738ba8e02bc8cb1c4e832611621aa9666f4a24 (patch)
tree1655861deb79a5869cf19fd83b4d002e9fd1b682 /drivers/ide/ide-probe.c
parentdrbd: Convert timers to use timer_setup() (diff)
downloadlinux-dev-10738ba8e02bc8cb1c4e832611621aa9666f4a24.tar.xz
linux-dev-10738ba8e02bc8cb1c4e832611621aa9666f4a24.zip
ide: 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: "David S. Miller" <davem@davemloft.net> Cc: linux-ide@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 01b2adfd8226..27a2488c7468 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1184,7 +1184,7 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
spin_lock_init(&hwif->lock);
- setup_timer(&hwif->timer, &ide_timer_expiry, (unsigned long)hwif);
+ timer_setup(&hwif->timer, ide_timer_expiry, 0);
init_completion(&hwif->gendev_rel_comp);