diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 15:56:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 15:56:58 -0700 |
| commit | 56868a460b83c0f93d339256a81064d89aadae8e (patch) | |
| tree | 7df967bddaab36c88005d5d7b8a07fc94cffb798 /drivers/ide/ide-probe.c | |
| parent | 7fc22f45fef00b55d9517e340650b6a0368faff1 (diff) | |
| parent | acfead32f3f938e456d7d5e1a82c743d30b8b886 (diff) | |
| download | linux-56868a460b83c0f93d339256a81064d89aadae8e.tar.gz linux-56868a460b83c0f93d339256a81064d89aadae8e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
"Two small cleanups in the IDE layer"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: don't call memcpy with the same source and destination
ide: use setup_timer
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); |