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-io.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-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 3a234701d92c..6f25da56a169 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -611,9 +611,9 @@ static int drive_is_ready(ide_drive_t *drive) * logic that wants cleaning up. */ -void ide_timer_expiry (unsigned long data) +void ide_timer_expiry (struct timer_list *t) { - ide_hwif_t *hwif = (ide_hwif_t *)data; + ide_hwif_t *hwif = from_timer(hwif, t, timer); ide_drive_t *uninitialized_var(drive); ide_handler_t *handler; unsigned long flags; |