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: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <apais@linux.microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index 65f8a4b6ed0c45e59e206ea8a907275ae2177b9e..3b8576b9c2f92e0b52da8355759eb82e33125902 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index ae305c2e922543ff27e2c484a5a3089b9541062d..9e48509ed3b2328da7f4f752e5542fd3f8e5d971 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -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;
 

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index 527b52e482768ea4d0503f8e94d849f17f0964b2..64bed7ac3836101299f1f8e0463e375bae45be5b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -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);
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cq.c b/drivers/net/ethernet/mellanox/mlx5/core/cq.c
index 8379b24cb838d6be4c0dd5d5f7851aefe1718f0f..df3e4938ecdd9a920d1462b67ed579a7de0d8295 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cq.c
@@ -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;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 31ef9f8420c8763b2deed3d14cc77d13961fa792..ec38405d467fa32fffbd20df5f805f00e90df071 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -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) {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
index 831d2c39e153421503c2a863737016d18e5004cb..9f6d97eae0ae7a17c17a179b73180c5208eb9070 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
@@ -388,9 +388,9 @@ static inline void mlx5_fpga_conn_cqes(struct mlx5_fpga_conn *conn,
        mlx5_fpga_conn_arm_cq(conn);
 }
 
-static void mlx5_fpga_conn_cq_tasklet(unsigned long data)
+static void mlx5_fpga_conn_cq_tasklet(struct tasklet_struct *t)
 {
-       struct mlx5_fpga_conn *conn = (void *)data;
+       struct mlx5_fpga_conn *conn = from_tasklet(conn, t, cq.tasklet);
 
        if (unlikely(!conn->qp.active))
                return;
@@ -478,8 +478,7 @@ static int mlx5_fpga_conn_create_cq(struct mlx5_fpga_conn *conn, int cq_size)
        conn->cq.mcq.comp       = mlx5_fpga_conn_cq_complete;
        conn->cq.mcq.irqn       = irqn;
        conn->cq.mcq.uar        = fdev->conn_res.uar;
-       tasklet_init(&conn->cq.tasklet, mlx5_fpga_conn_cq_tasklet,
-                    (unsigned long)conn);
+       tasklet_setup(&conn->cq.tasklet, mlx5_fpga_conn_cq_tasklet);
 
        mlx5_fpga_dbg(fdev, "Created CQ #0x%x\n", conn->cq.mcq.cqn);
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h b/drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h
index 4aaca7400fb291fc858f74fc84d1c3ebbc3d1f32..078a7cc29bf0aee85ed5f4f7c0220fc2a219c0b2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h
@@ -77,7 +77,7 @@ int mlx5_eq_add_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq);
 void mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq);
 struct mlx5_eq_comp *mlx5_eqn2comp_eq(struct mlx5_core_dev *dev, int eqn);
 struct mlx5_eq *mlx5_get_async_eq(struct mlx5_core_dev *dev);
-void mlx5_cq_tasklet_cb(unsigned long data);
+void mlx5_cq_tasklet_cb(struct tasklet_struct *t);
 struct cpumask *mlx5_eq_comp_cpumask(struct mlx5_core_dev *dev, int ix);
 
 u32 mlx5_eq_poll_irq_disabled(struct mlx5_eq_comp *eq);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 1c64b03ff48e61484c0c6a1568416c55dda41605..641cdd81882b87be67073d3d3f433c88610ea16e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -620,9 +620,9 @@ static char *mlxsw_pci_cq_sw_cqe_get(struct mlxsw_pci_queue *q)
        return elem;
 }
 
-static void mlxsw_pci_cq_tasklet(unsigned long data)
+static void mlxsw_pci_cq_tasklet(struct tasklet_struct *t)
 {
-       struct mlxsw_pci_queue *q = (struct mlxsw_pci_queue *) data;
+       struct mlxsw_pci_queue *q = from_tasklet(q, t, tasklet);
        struct mlxsw_pci *mlxsw_pci = q->pci;
        char *cqe;
        int items = 0;
@@ -733,9 +733,9 @@ static char *mlxsw_pci_eq_sw_eqe_get(struct mlxsw_pci_queue *q)
        return elem;
 }
 
-static void mlxsw_pci_eq_tasklet(unsigned long data)
+static void mlxsw_pci_eq_tasklet(struct tasklet_struct *t)
 {
-       struct mlxsw_pci_queue *q = (struct mlxsw_pci_queue *) data;
+       struct mlxsw_pci_queue *q = from_tasklet(q, t, tasklet);
        struct mlxsw_pci *mlxsw_pci = q->pci;
        u8 cq_count = mlxsw_pci_cq_count(mlxsw_pci);
        unsigned long active_cqns[BITS_TO_LONGS(MLXSW_PCI_CQS_MAX)];
@@ -792,7 +792,7 @@ struct mlxsw_pci_queue_ops {
                    struct mlxsw_pci_queue *q);
        void (*fini)(struct mlxsw_pci *mlxsw_pci,
                     struct mlxsw_pci_queue *q);
-       void (*tasklet)(unsigned long data);
+       void (*tasklet)(struct tasklet_struct *t);
        u16 (*elem_count_f)(const struct mlxsw_pci_queue *q);
        u8 (*elem_size_f)(const struct mlxsw_pci_queue *q);
        u16 elem_count;
@@ -855,7 +855,7 @@ static int mlxsw_pci_queue_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
        q->pci = mlxsw_pci;
 
        if (q_ops->tasklet)
-               tasklet_init(&q->tasklet, q_ops->tasklet, (unsigned long) q);
+               tasklet_setup(&q->tasklet, q_ops->tasklet);
 
        mem_item->size = MLXSW_PCI_AQ_SIZE;
        mem_item->buf = pci_alloc_consistent(mlxsw_pci->pdev,