Commit a1be161a authored by Allen Pais's avatar Allen Pais Committed by David S. Miller
Browse files

net: mlx: convert tasklets to use new tasklet_setup() API 



In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <apais@linux.microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd002b54

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

+2 −2
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ 
#define TASKLET_MAX_TIME 2

#define TASKLET_MAX_TIME_JIFFIES msecs_to_jiffies(TASKLET_MAX_TIME)



void mlx4_cq_tasklet_cb(unsigned long data)

void mlx4_cq_tasklet_cb(struct tasklet_struct *t)

{

	unsigned long flags;

	unsigned long end = jiffies + TASKLET_MAX_TIME_JIFFIES;

	struct mlx4_eq_tasklet *ctx = (struct mlx4_eq_tasklet *)data;

	struct mlx4_eq_tasklet *ctx = from_tasklet(ctx, t, task);

	struct mlx4_cq *mcq, *temp;



	spin_lock_irqsave(&ctx->lock, flags);

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

+1 −2
Original line number Diff line number Diff line
@@ -1057,8 +1057,7 @@ static int mlx4_create_eq(struct mlx4_dev *dev, int nent, 
	INIT_LIST_HEAD(&eq->tasklet_ctx.list);

	INIT_LIST_HEAD(&eq->tasklet_ctx.process_list);

	spin_lock_init(&eq->tasklet_ctx.lock);

	tasklet_init(&eq->tasklet_ctx.task, mlx4_cq_tasklet_cb,

		     (unsigned long)&eq->tasklet_ctx);

	tasklet_setup(&eq->tasklet_ctx.task, mlx4_cq_tasklet_cb);



	return err;

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+1 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ void mlx4_cmd_use_polling(struct mlx4_dev *dev); 
int mlx4_comm_cmd(struct mlx4_dev *dev, u8 cmd, u16 param,

		  u16 op, unsigned long timeout);



void mlx4_cq_tasklet_cb(unsigned long data);

void mlx4_cq_tasklet_cb(struct tasklet_struct *t);

void mlx4_cq_completion(struct mlx4_dev *dev, u32 cqn);

void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type);

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

+2 −2
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ 
#define TASKLET_MAX_TIME 2

#define TASKLET_MAX_TIME_JIFFIES msecs_to_jiffies(TASKLET_MAX_TIME)



void mlx5_cq_tasklet_cb(unsigned long data)

void mlx5_cq_tasklet_cb(struct tasklet_struct *t)

{

	unsigned long flags;

	unsigned long end = jiffies + TASKLET_MAX_TIME_JIFFIES;

	struct mlx5_eq_tasklet *ctx = (struct mlx5_eq_tasklet *)data;

	struct mlx5_eq_tasklet *ctx = from_tasklet(ctx, t, task);

	struct mlx5_core_cq *mcq;

	struct mlx5_core_cq *temp;

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

+1 −2
Original line number Diff line number Diff line
@@ -788,8 +788,7 @@ static int create_comp_eqs(struct mlx5_core_dev *dev) 
		INIT_LIST_HEAD(&eq->tasklet_ctx.list);

		INIT_LIST_HEAD(&eq->tasklet_ctx.process_list);

		spin_lock_init(&eq->tasklet_ctx.lock);

		tasklet_init(&eq->tasklet_ctx.task, mlx5_cq_tasklet_cb,

			     (unsigned long)&eq->tasklet_ctx);

		tasklet_setup(&eq->tasklet_ctx.task, mlx5_cq_tasklet_cb);



		eq->irq_nb.notifier_call = mlx5_eq_comp_int;

		param = (struct mlx5_eq_param) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE