Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965870AbdCXOR0 (ORCPT ); Fri, 24 Mar 2017 10:17:26 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33732 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965780AbdCXOQg (ORCPT ); Fri, 24 Mar 2017 10:16:36 -0400 From: Geliang Tang To: Muli Ben-Yehuda , Jon Mason , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: Geliang Tang , x86@kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86/pci-calgary: use setup_timer Date: Fri, 24 Mar 2017 22:15:14 +0800 Message-Id: X-Mailer: git-send-email 2.9.3 In-Reply-To: <4841d2c2936addc27a2e774041d04ec16885ba03.1490341208.git.geliangtang@gmail.com> References: <4841d2c2936addc27a2e774041d04ec16885ba03.1490341208.git.geliangtang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 841 Lines: 25 Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang --- 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