Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3142692a authored by Kees Cook's avatar Kees Cook
Browse files

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 <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: default avatarKees Cook <keescook@chromium.org>
parent 5943cf4a

arch/x86/kernel/pci-calgary_64.c

+3 −5
Original line number Diff line number Diff line
@@ -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);

}