net: usb: r8152: use new tasklet API

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>

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 67cd698..0d7d293 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -2393,11 +2393,9 @@ static void tx_bottom(struct r8152 *tp)
        } while (res == 0);
 }
 
-static void bottom_half(unsigned long data)
+static void bottom_half(struct tasklet_struct *t)
 {
-       struct r8152 *tp;
-
-       tp = (struct r8152 *)data;
+       struct r8152 *tp = from_tasklet(tp, t, tx_tl);
 
        if (test_bit(RTL8152_UNPLUG, &tp->flags))
                return;
@@ -6714,7 +6712,7 @@ static int rtl8152_probe(struct usb_interface *intf,
        mutex_init(&tp->control);
        INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
        INIT_DELAYED_WORK(&tp->hw_phy_work, rtl_hw_phy_work_func_t);
-       tasklet_init(&tp->tx_tl, bottom_half, (unsigned long)tp);
+       tasklet_setup(&tp->tx_tl, bottom_half);
        tasklet_disable(&tp->tx_tl);
 
        netdev->netdev_ops = &rtl8152_netdev_ops;