[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200914073131.803374-11-allen.lkml@gmail.com>
Date: Mon, 14 Sep 2020 13:01:29 +0530
From: Allen Pais <allen.lkml@...il.com>
To: davem@...emloft.net
Cc: m.grzeschik@...gutronix.de, kuba@...nel.org, paulus@...ba.org,
oliver@...kum.org, woojung.huh@...rochip.com,
UNGLinuxDriver@...rochip.com, petkan@...leusys.com,
netdev@...r.kernel.org, linux-usb@...r.kernel.org,
linux-ppp@...r.kernel.org, Allen Pais <apais@...ux.microsoft.com>,
Romain Perier <romain.perier@...il.com>
Subject: [RESEND net-next v2 10/12] net: r8152: convert tasklets to use new tasklet_setup() API
From: Allen Pais <apais@...ux.microsoft.com>
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@...il.com>
Signed-off-by: Allen Pais <apais@...ux.microsoft.com>
---
drivers/net/usb/r8152.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index b1770489aca5..2d706cdbf9a2 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -2410,11 +2410,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;
@@ -6730,7 +6728,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;
--
2.25.1
Powered by blists - more mailing lists