Commit-ID: 352ef03ca0ad07156bcee6e244c2df6f1a19bb05 Gitweb: http://git.kernel.org/tip/352ef03ca0ad07156bcee6e244c2df6f1a19bb05 Author: Geliang Tang <geliangt...@gmail.com> AuthorDate: Fri, 24 Mar 2017 22:15:14 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Fri, 31 Mar 2017 10:21:04 +0200
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 <geliangt...@gmail.com> Cc: io...@lists.linux-foundation.org Cc: Jon Mason <jdma...@kudzu.us> Cc: Muli Ben-Yehuda <mu...@mulix.org> Link: http://lkml.kernel.org/r/e4f1888b9e4a87f6a6345f86ed23071483763b22.1490340972.git.geliangt...@gmail.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- 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); }
