linux-ppp.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 3/9] net: cdc_ncm: convert tasklets to use new tasklet_setup() API
Date: Mon, 17 Aug 2020 08:58:08 +0000	[thread overview]
Message-ID: <20200817084614.24263-7-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/cdc_ncm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index e04f588538cc..57a95ef90385 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -61,7 +61,7 @@ static bool prefer_mbim;
 module_param(prefer_mbim, bool, 0644);
 MODULE_PARM_DESC(prefer_mbim, "Prefer MBIM setting on dual NCM/MBIM functions");
 
-static void cdc_ncm_txpath_bh(unsigned long param);
+static void cdc_ncm_txpath_bh(struct tasklet_struct *t);
 static void cdc_ncm_tx_timeout_start(struct cdc_ncm_ctx *ctx);
 static enum hrtimer_restart cdc_ncm_tx_timer_cb(struct hrtimer *hr_timer);
 static struct usb_driver cdc_ncm_driver;
@@ -815,7 +815,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
 
 	hrtimer_init(&ctx->tx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 	ctx->tx_timer.function = &cdc_ncm_tx_timer_cb;
-	tasklet_init(&ctx->bh, cdc_ncm_txpath_bh, (unsigned long)dev);
+	tasklet_setup(&ctx->bh, cdc_ncm_txpath_bh);
 	atomic_set(&ctx->stop, 0);
 	spin_lock_init(&ctx->mtx);
 
@@ -1468,9 +1468,9 @@ static enum hrtimer_restart cdc_ncm_tx_timer_cb(struct hrtimer *timer)
 	return HRTIMER_NORESTART;
 }
 
-static void cdc_ncm_txpath_bh(unsigned long param)
+static void cdc_ncm_txpath_bh(struct tasklet_struct *t)
 {
-	struct usbnet *dev = (struct usbnet *)param;
+	struct usbnet *dev = from_tasklet(dev, t, bh);
 	struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0];
 
 	spin_lock_bh(&ctx->mtx);
-- 
2.17.1

  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 ` Allen Pais [this message]
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 ` [PATCH 7/9] net: r8152: " Allen Pais
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-7-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 \
    --subject='Re: [PATCH 3/9] net: cdc_ncm: 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).