leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, calgary: Convert timers to use timer_setup()

Browse Source 
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Muli Ben-Yehuda <mulix@mulix.org>
Cc: Jon Mason <jdmason@kudzu.us>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: iommu@lists.linux-foundation.org
Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Kees Cook 2017-10-19 16:37:43 -07:00
parent 5943cf4a59
commit 3142692a5e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/pci-calgary_64.c
View File

@ -898,10 +898,9 @@ static void calioc2_dump_error_regs(struct iommu_table *tbl)
PHB_ROOT_COMPLEX_STATUS); PHB_ROOT_COMPLEX_STATUS);
} }
static void calgary_watchdog(unsigned long data) static void calgary_watchdog(struct timer_list *t)
{ {
struct pci_dev *dev = (struct pci_dev *)data; struct iommu_table *tbl = from_timer(tbl, t, watchdog_timer);
struct iommu_table *tbl = pci_iommu(dev->bus);
void __iomem *bbar = tbl->bbar; void __iomem *bbar = tbl->bbar;
u32 val32; u32 val32;
void __iomem *target; void __iomem *target;
@ -1016,8 +1015,7 @@ static void __init calgary_enable_translation(struct pci_dev *dev)
writel(cpu_to_be32(val32), target); writel(cpu_to_be32(val32), target);
readl(target); /* flush */ readl(target); /* flush */
setup_timer(&tbl->watchdog_timer, &calgary_watchdog, timer_setup(&tbl->watchdog_timer, calgary_watchdog, 0);
(unsigned long)dev);
mod_timer(&tbl->watchdog_timer, jiffies); mod_timer(&tbl->watchdog_timer, jiffies);
} }