x86, calgary: Convert timers to use timer_setup()
PATCH 1/1 x86, calgary: Convert timers to use timer_setup()
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 <[email protected]>
Cc Jon Mason <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Signed-off-by Kees Cook <[email protected]>
--- arch/x86/kernel/pci-calgary_64.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
arch/x86/kernel/pci-calgary_64.c +3 -5
@@ -898,10 +898,9 @@ static void calioc2_dump_error_regs(struct iommu_table *tbl) 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 =pci_iommu (dev->bus); +struct iommu_table *tbl =from_timer (tbl, t, watchdog_timer);void __iomem *bbar = tbl->bbar;u32 val32;void __iomem *target;
@@ -1016,8 +1015,7 @@ static void __init calgary_enable_translation(struct pci_dev *dev)writel (cpu_to_be32 (val32), target);readl (target);/* flush */ -setup_timer (&tbl->watchdog_timer, &calgary_watchdog, - (unsigned long )dev); +timer_setup (&tbl->watchdog_timer, calgary_watchdog,0 );mod_timer (&tbl->watchdog_timer, jiffies); }
Signature · 6 lines
2.7.4 -- Kees Cook Pixel Security