diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-11-07 11:59:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-11-07 11:59:40 +0100 |
| commit | 1c10bbee8cf7c8df4e5d9e8ccc9754b200f625ff (patch) | |
| tree | 3fb75d197d16d63878fdb4a478e9f6a555a95f80 /drivers/ide/ide-probe.c | |
| parent | c7c2f3d9e86c2f09a514247d1623f00850125636 (diff) | |
| parent | 5ea22086ed42bef8dde93f45a42a3ace486eb788 (diff) | |
| download | linux-1c10bbee8cf7c8df4e5d9e8ccc9754b200f625ff.tar.gz linux-1c10bbee8cf7c8df4e5d9e8ccc9754b200f625ff.tar.xz | |
Merge tag 'timers-conversion-next4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core
Pull the 4th timer conversion batch from Kees Cook
- A couple fixes for less common build configurations
- More stragglers that have either been reviewed or gone
long enough on list
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 2 |
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); |