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

Commit 0365b047 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

drivers/net: mellanox: 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: Saeed Mahameed <saeedm@mellanox.com>
Cc: Matan Barak <matanb@mellanox.com>
Cc: Leon Romanovsky <leonro@mellanox.com>
Cc: netdev@vger.kernel.org
Cc: linux-rdma@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34309b36

drivers/net/ethernet/mellanox/mlx5/core/health.c

+3 −3
Original line number Diff line number Diff line
@@ -285,9 +285,9 @@ void mlx5_trigger_health_work(struct mlx5_core_dev *dev) 
	spin_unlock_irqrestore(&health->wq_lock, flags);

}



static void poll_health(unsigned long data)

static void poll_health(struct timer_list *t)

{

	struct mlx5_core_dev *dev = (struct mlx5_core_dev *)data;

	struct mlx5_core_dev *dev = from_timer(dev, t, priv.health.timer);

	struct mlx5_core_health *health = &dev->priv.health;

	u32 count;
@@ -320,7 +320,7 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev) 
{

	struct mlx5_core_health *health = &dev->priv.health;



	setup_timer(&health->timer, poll_health, (unsigned long)dev);

	timer_setup(&health->timer, poll_health, 0);

	health->sick = 0;

	clear_bit(MLX5_DROP_NEW_HEALTH_WORK, &health->flags);

	clear_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags);