[PATCH] x86/pci-calgary: use setup_timer

[Geliang Tang]

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

Signed-off-by: Geliang Tang <geliangt...@gmail.com>
---
 arch/x86/kernel/pci-calgary_64.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 0c150c0..fda7867 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);
 }
 
-- 
2.9.3