linux-kernel - [tip:x86/cleanups] x86/pci-calgary: Use setup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-352ef03ca0ad07156bcee6e244c2df6f1a19bb05@git.kernel.org>
Date:   Fri, 31 Mar 2017 01:24:51 -0700
From:   tip-bot for Geliang Tang <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mulix@...ix.org, hpa@...or.com, mingo@...nel.org, jdmason@...zu.us,
        linux-kernel@...r.kernel.org, tglx@...utronix.de,
        geliangtang@...il.com
Subject: [tip:x86/cleanups] x86/pci-calgary: Use setup_timer() instead of
 open coding it.

Commit-ID:  352ef03ca0ad07156bcee6e244c2df6f1a19bb05
Gitweb:     http://git.kernel.org/tip/352ef03ca0ad07156bcee6e244c2df6f1a19bb05
Author:     Geliang Tang <geliangtang@...il.com>
AuthorDate: Fri, 24 Mar 2017 22:15:14 +0800
Committer:  Thomas Gleixner <tglx@...utronix.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 <geliangtang@...il.com>
Cc: iommu@...ts.linux-foundation.org
Cc: Jon Mason <jdmason@...zu.us>
Cc: Muli Ben-Yehuda <mulix@...ix.org>
Link: http://lkml.kernel.org/r/e4f1888b9e4a87f6a6345f86ed23071483763b22.1490340972.git.geliangtang@gmail.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.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);
 }