diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-05 12:28:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-05 12:28:24 +0200 |
| commit | 2083c3d9cc58493e3adc701289ae020e2ace95b6 (patch) | |
| tree | 20093a5d6eea619278e4f2f2246bc3c554dba5bc /arch/x86/kernel | |
| parent | 3bc480c1eb54fd91fd05f7a6800e0f2385ffea92 (diff) | |
| parent | 352ef03ca0ad07156bcee6e244c2df6f1a19bb05 (diff) | |
| download | linux-next-2083c3d9cc58493e3adc701289ae020e2ace95b6.tar.gz | |
Merge branch 'x86/cleanups'
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 0c150c06fa5a..fda7867046d0 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -1007,9 +1007,8 @@ static void __init calgary_enable_translation(struct pci_dev *dev) writel(cpu_to_be32(val32), target); readl(target); /* flush */ - init_timer(&tbl->watchdog_timer); - tbl->watchdog_timer.function = &calgary_watchdog; - tbl->watchdog_timer.data = (unsigned long)dev; + setup_timer(&tbl->watchdog_timer, &calgary_watchdog, + (unsigned long)dev); mod_timer(&tbl->watchdog_timer, jiffies); } |