From: Allen Pais <allen.cryptic@gmail.com>
To: m.grzeschik@pengutronix.de, davem@davemloft.net,
paulus@samba.org, oliver@neukum.org, woojung.huh@microchip.com,
petkan@nucleusys.com
Cc: keescook@chromium.org, netdev@vger.kernel.org,
linux-ppp@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org, Allen Pais <allen.lkml@gmail.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [PATCH 7/9] net: r8152: convert tasklets to use new tasklet_setup() API
Date: Mon, 17 Aug 2020 08:58:12 +0000 [thread overview]
Message-ID: <20200817084614.24263-11-allen.cryptic@gmail.com> (raw)
In-Reply-To: <20200817084614.24263-1-allen.cryptic@gmail.com>
From: Allen Pais <allen.lkml@gmail.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 <allen.lkml@gmail.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 2b02fefd094d..6805686abfe7 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.17.1
next prev parent reply other threads:[~2020-08-17 8:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 8:58 [PATCH 0/8] drivers: net: convert tasklets to use new tasklet_setup() Allen Pais
2020-08-17 8:58 ` [PATCH 1/2] net: arcnet: convert tasklets to use new tasklet_setup() API Allen Pais
2020-08-17 8:58 ` [PATCH 1/9] net: ifb: " Allen Pais
2020-08-17 8:58 ` [PATCH] net: mvpp2: Prepare to use the new tasklet API Allen Pais
2020-08-17 8:58 ` [PATCH 2/2] net: caif: convert tasklets to use new tasklet_setup() API Allen Pais
2020-08-17 8:58 ` [PATCH 2/9] net: ppp: " Allen Pais
2020-08-17 8:58 ` [PATCH 3/9] net: cdc_ncm: " Allen Pais
2020-08-17 8:58 ` [PATCH 4/9] net: hso: " Allen Pais
2020-08-17 8:58 ` [PATCH 5/9] net: lan78xx: " Allen Pais
2020-08-17 8:58 ` [PATCH 6/9] net: pegasus: " Allen Pais
2020-08-17 8:58 ` Allen Pais [this message]
2020-08-17 8:58 ` [PATCH 8/9] net: rtl8150: " Allen Pais
2020-08-17 8:58 ` [PATCH 9/9] net: usbnet: " Allen Pais
2020-09-11 5:57 ` [PATCH 0/8] drivers: net: convert tasklets to use new tasklet_setup() Allen
2020-09-11 20:19 ` David Miller
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=20200817084614.24263-11-allen.cryptic@gmail.com \
--to=allen.cryptic@gmail.com \
--cc=allen.lkml@gmail.com \
--cc=davem@davemloft.net \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-ppp@vger.kernel.org \
--cc=linux-usb@vger.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).