linux-ppp.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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, linux-usb@vger.kernel.org,
	linux-ppp@vger.kernel.org, Allen Pais <apais@linux.microsoft.com>,
	Romain Perier <romain.perier@gmail.com>
Subject: [RESEND net-next v2 10/12] net: r8152: convert tasklets to use new tasklet_setup() API
Date: Mon, 14 Sep 2020 07:43:29 +0000	[thread overview]
Message-ID: <20200914073131.803374-11-allen.lkml@gmail.com> (raw)
In-Reply-To: <20200914073131.803374-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 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

  parent reply	other threads:[~2020-09-14  7:43 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-14  7:43 [RESEND net-next v2 00/12]drivers: net: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 01/12] net: mvpp2: Prepare to use the new tasklet API Allen Pais
2020-09-15  1:02   ` Jakub Kicinski
2020-09-14  7:43 ` [RESEND net-next v2 02/12] net: arcnet: convert tasklets to use new tasklet_setup() API Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 03/12] net: caif: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 04/12] net: ifb: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 05/12] net: ppp: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 06/12] net: cdc_ncm: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 07/12] net: hso: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 08/12] net: lan78xx: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 09/12] net: pegasus: " Allen Pais
2020-09-14  7:43 ` Allen Pais [this message]
2020-09-14  7:43 ` [RESEND net-next v2 11/12] net: rtl8150: " Allen Pais
2020-09-14  7:43 ` [RESEND net-next v2 12/12] net: usbnet: " Allen Pais
2020-09-14  8:02   ` Oliver Neukum
2020-09-14 20:24 ` [RESEND net-next v2 00/12]drivers: net: " David Miller
2020-09-15  4:20   ` Allen Pais
2020-09-14 21:16 ` Saeed Mahameed
2020-09-15  4:24   ` Allen Pais
2020-09-15  4:41     ` Saeed Mahameed
2020-09-15  4:56       ` 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=20200914073131.803374-11-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=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 \
    --subject='Re: [RESEND net-next v2 10/12] net: r8152: convert tasklets to use new tasklet_setup() API' \
    /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

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).