x86/pci-calgary: Use setup_timer() instead of open coding it.

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Cc: iommu@lists.linux-foundation.org
Cc: Jon Mason <jdmason@kudzu.us>
Cc: Muli Ben-Yehuda <mulix@mulix.org>
Link: http://lkml.kernel.org/r/e4f1888b9e4a87f6a6345f86ed23071483763b22.1490340972.git.geliangtang@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 0c150c06fa5a5642a6630cfeed2b6a74a1acab17..fda7867046d0931a9947d4488b9b69f6e6a128f0 100644 (file)
--- 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);
 }