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

Commit 55c0fcc3 authored by Kees Cook's avatar Kees Cook Committed by Doug Ledford
Browse files

net/mlx4_core: 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: Tariq Toukan <tariqt@mellanox.com>
Cc: netdev@vger.kernel.org
Cc: linux-rdma@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 6d290d69

drivers/net/ethernet/mellanox/mlx4/catas.c

+4 −6
Original line number Diff line number Diff line
@@ -231,10 +231,10 @@ static void dump_err_buf(struct mlx4_dev *dev) 
			 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 = from_timer(priv, t, catas_err.timer);

	struct mlx4_dev *dev = &priv->dev;

	u32 slave_read;



	if (mlx4_is_slave(dev)) {
@@ -277,7 +277,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) 
	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)) {
@@ -293,8 +293,6 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) 
		}

	}



	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);