D59679.1793440512.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D59679.1793440512.diff
View Options

	diff --git a/sys/dev/mlx4/mlx4_core/mlx4_catas.c b/sys/dev/mlx4/mlx4_core/mlx4_catas.c
	--- a/sys/dev/mlx4/mlx4_core/mlx4_catas.c
	+++ b/sys/dev/mlx4/mlx4_core/mlx4_catas.c
	@@ -226,10 +226,10 @@
	i, swab32(readl(priv->catas_err.map + i)));
	}

	-static void poll_catas(unsigned long dev_ptr)
	+static void poll_catas(struct timer_list *t)
	{
	- struct mlx4_dev dev = (struct mlx4_dev ) dev_ptr;
	- struct mlx4_priv *priv = mlx4_priv(dev);
	+ struct mlx4_priv *priv = timer_container_of(priv, t, catas_err.timer);
	+ struct mlx4_dev *dev = &priv->dev;
	u32 slave_read;

	if (mlx4_is_slave(dev)) {
	@@ -272,7 +272,7 @@
	phys_addr_t addr;

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

	if (!mlx4_is_slave(dev)) {
	@@ -288,8 +288,6 @@
	}
	}

	- priv->catas_err.timer.data = (unsigned long) dev;
	- priv->catas_err.timer.function = poll_catas;
	priv->catas_err.timer.expires =
	round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL);
	add_timer(&priv->catas_err.timer);