D59677.id186734.diff
No OneTemporary
Actions

Size

985 B

Referenced Files

None

Subscribers

None

D59677.id186734.diff
View Options

	diff --git a/sys/dev/mthca/mthca_catas.c b/sys/dev/mthca/mthca_catas.c
	--- a/sys/dev/mthca/mthca_catas.c
	+++ b/sys/dev/mthca/mthca_catas.c
	@@ -132,9 +132,9 @@
	spin_unlock_irqrestore(&catas_lock, flags);
	}

	-static void poll_catas(unsigned long dev_ptr)
	+static void poll_catas(struct timer_list *t)
	{
	- struct mthca_dev dev = (struct mthca_dev ) dev_ptr;
	+ struct mthca_dev *dev = timer_container_of(dev, t, catas_err.timer);
	int i;

	for (i = 0; i < dev->catas_err.size; ++i)
	@@ -151,7 +151,7 @@
	{
	phys_addr_t addr;

	- init_timer(&dev->catas_err.timer);
	+ timer_setup(&dev->catas_err.timer, poll_catas, 0);
	dev->catas_err.map = NULL;

	addr = pci_resource_start(dev->pdev, 0) +
	@@ -166,8 +166,6 @@
	return;
	}

	- dev->catas_err.timer.data = (unsigned long) dev;
	- dev->catas_err.timer.function = poll_catas;
	dev->catas_err.timer.expires = jiffies + MTHCA_CATAS_POLL_INTERVAL;
	INIT_LIST_HEAD(&dev->catas_err.list);
	add_timer(&dev->catas_err.timer);