public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Geliang Tang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mulix@mulix.org, hpa@zytor.com, mingo@kernel.org,
	jdmason@kudzu.us, linux-kernel@vger.kernel.org,
	tglx@linutronix.de, geliangtang@gmail.com
Subject: [tip:x86/cleanups] x86/pci-calgary: Use setup_timer() instead of open coding it.
Date: Fri, 31 Mar 2017 01:24:51 -0700	[thread overview]
Message-ID: <tip-352ef03ca0ad07156bcee6e244c2df6f1a19bb05@git.kernel.org> (raw)
In-Reply-To: <e4f1888b9e4a87f6a6345f86ed23071483763b22.1490340972.git.geliangtang@gmail.com>

Commit-ID:  352ef03ca0ad07156bcee6e244c2df6f1a19bb05
Gitweb:     http://git.kernel.org/tip/352ef03ca0ad07156bcee6e244c2df6f1a19bb05
Author:     Geliang Tang <geliangtang@gmail.com>
AuthorDate: Fri, 24 Mar 2017 22:15:14 +0800
Committer:  Thomas Gleixner <tglx@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 <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>

---
 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);
 }
 

  reply	other threads:[~2017-03-31  8:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-24 14:15 [PATCH] aoe: use setup_timer Geliang Tang
2017-03-24 14:15 ` [PATCH] block: floppy: " Geliang Tang
2017-03-24 14:23   ` Jens Axboe
2017-03-24 14:15 ` [PATCH] drbd: " Geliang Tang
2017-03-24 14:15 ` [PATCH] ipmi_ssif: " Geliang Tang
2017-03-25  2:59   ` Corey Minyard
2017-03-24 14:15 ` [PATCH] mg_disk: " Geliang Tang
2017-03-24 14:15 ` [PATCH] x86/pci-calgary: " Geliang Tang
2017-03-31  8:24   ` tip-bot for Geliang Tang [this message]
2017-03-25 19:32 ` [PATCH] aoe: " Ed Cashin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-352ef03ca0ad07156bcee6e244c2df6f1a19bb05@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=geliangtang@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jdmason@kudzu.us \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mulix@mulix.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox