ibmvnic: 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/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 6b619c1902390789c785ada773be2ead9778dd70..e2a3c4bf00c98f9e5fddf359814840ed24b7442a 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4842,9 +4842,9 @@ static irqreturn_t ibmvnic_interrupt(int irq, void *instance)
        return IRQ_HANDLED;
 }
 
-static void ibmvnic_tasklet(void *data)
+static void ibmvnic_tasklet(struct tasklet_struct *t)
 {
-       struct ibmvnic_adapter *adapter = data;
+       struct ibmvnic_adapter *adapter = from_tasklet(adapter, t, tasklet);
        struct ibmvnic_crq_queue *queue = &adapter->crq;
        union ibmvnic_crq *crq;
        unsigned long flags;
@@ -4979,8 +4979,7 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter)
 
        retrc = 0;
 
-       tasklet_init(&adapter->tasklet, (void *)ibmvnic_tasklet,
-                    (unsigned long)adapter);
+       tasklet_setup(&adapter->tasklet, (void *)ibmvnic_tasklet);
 
        netdev_dbg(adapter->netdev, "registering irq 0x%x\n", vdev->irq);
        snprintf(crq->name, sizeof(crq->name), "ibmvnic-%x",