OSDN Git Service

caif_virtio: use new tasklet API
authorEmil Renner Berthing <kernel@esmil.dk>
Sat, 30 Jan 2021 23:47:23 +0000 (00:47 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 2 Feb 2021 23:51:17 +0000 (15:51 -0800)
This converts the driver to use the new tasklet API introduced in
commit 12cc923f1ccc ("tasklet: Introduce new initialization API")

Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/caif/caif_virtio.c

index 47a6d62..106f089 100644 (file)
@@ -598,9 +598,9 @@ err:
        return NETDEV_TX_OK;
 }
 
-static void cfv_tx_release_tasklet(unsigned long drv)
+static void cfv_tx_release_tasklet(struct tasklet_struct *t)
 {
-       struct cfv_info *cfv = (struct cfv_info *)drv;
+       struct cfv_info *cfv = from_tasklet(cfv, t, tx_release_tasklet);
        cfv_release_used_buf(cfv->vq_tx);
 }
 
@@ -716,9 +716,7 @@ static int cfv_probe(struct virtio_device *vdev)
        cfv->ctx.head = USHRT_MAX;
        netif_napi_add(netdev, &cfv->napi, cfv_rx_poll, CFV_DEFAULT_QUOTA);
 
-       tasklet_init(&cfv->tx_release_tasklet,
-                    cfv_tx_release_tasklet,
-                    (unsigned long)cfv);
+       tasklet_setup(&cfv->tx_release_tasklet, cfv_tx_release_tasklet);
 
        /* Carrier is off until netdevice is opened */
        netif_carrier_off(netdev);