From: Allen Pais <allen.lkml@gmail.com>
To: davem@davemloft.net
Cc: m.grzeschik@pengutronix.de, kuba@kernel.org, paulus@samba.org,
oliver@neukum.org, woojung.huh@microchip.com,
UNGLinuxDriver@microchip.com, petkan@nucleusys.com,
netdev@vger.kernel.org, Allen Pais <apais@linux.microsoft.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [next-next v3 09/10] net: r8152: convert tasklets to use new tasklet_setup() API
Date: Tue, 6 Oct 2020 11:41:58 +0530 [thread overview]
Message-ID: <20201006061159.292340-10-allen.lkml@gmail.com> (raw)
In-Reply-To: <20201006061159.292340-1-allen.lkml@gmail.com>
From: Allen Pais <apais@linux.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@gmail.com>
Signed-off-by: Allen Pais <apais@linux.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 b1770489a..2d706cdbf 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
next prev parent reply other threads:[~2020-10-06 6:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 6:11 [next-next v3 00/10] drivers: net: convert tasklets to use new Allen Pais
2020-10-06 6:11 ` [next-next v3 01/10] net: arcnet: convert tasklets to use new tasklet_setup() API Allen Pais
2020-10-06 6:11 ` [next-next v3 02/10] net: caif: " Allen Pais
2020-10-06 6:11 ` [next-next v3 03/10] net: ifb: " Allen Pais
2020-10-06 6:11 ` [next-next v3 04/10] net: ppp: " Allen Pais
2020-10-06 6:11 ` [next-next v3 05/10] net: cdc_ncm: " Allen Pais
2020-10-08 23:58 ` Jakub Kicinski
2020-11-03 7:32 ` Allen Pais
2020-11-03 15:55 ` Jakub Kicinski
2020-10-06 6:11 ` [next-next v3 06/10] net: hso: " Allen Pais
2020-10-06 6:11 ` [next-next v3 07/10] net: lan78xx: " Allen Pais
2020-10-06 6:11 ` [next-next v3 08/10] net: pegasus: " Allen Pais
2020-10-06 6:11 ` Allen Pais [this message]
2020-10-06 6:11 ` [next-next v3 10/10] net: rtl8150: " Allen Pais
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201006061159.292340-10-allen.lkml@gmail.com \
--to=allen.lkml@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=apais@linux.microsoft.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=m.grzeschik@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=oliver@neukum.org \
--cc=paulus@samba.org \
--cc=petkan@nucleusys.com \
--cc=romain.perier@gmail.com \
--cc=woojung.huh@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).