diff options
author | Geliang Tang <geliangtang@gmail.com> | 2017-04-09 03:41:32 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-08 23:36:39 +0200 |
commit | 1a1df90ae195d9c676b6f313375f3e8f13752e13 (patch) | |
tree | 10e929488651981ec785e6a6de11f9cab43eb8e7 /drivers/ide/ide-probe.c | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
download | linux-1a1df90ae195d9c676b6f313375f3e8f13752e13.tar.xz linux-1a1df90ae195d9c676b6f313375f3e8f13752e13.zip |
ide: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index a74ae8df4bb8..023562565d11 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -1183,9 +1183,7 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index) spin_lock_init(&hwif->lock); - init_timer(&hwif->timer); - hwif->timer.function = &ide_timer_expiry; - hwif->timer.data = (unsigned long)hwif; + setup_timer(&hwif->timer, &ide_timer_expiry, (unsigned long)hwif); init_completion(&hwif->gendev_rel_comp); |