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 04/10] net: ppp: convert tasklets to use new tasklet_setup() API
Date: Tue, 6 Oct 2020 11:41:53 +0530 [thread overview]
Message-ID: <20201006061159.292340-5-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/ppp/ppp_async.c | 8 ++++----
drivers/net/ppp/ppp_synctty.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index 29a0917a8..2b66cf301 100644
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -101,7 +101,7 @@ static void ppp_async_input(struct asyncppp *ap, const unsigned char *buf,
char *flags, int count);
static int ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd,
unsigned long arg);
-static void ppp_async_process(unsigned long arg);
+static void ppp_async_process(struct tasklet_struct *t);
static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
int len, int inbound);
@@ -179,7 +179,7 @@ ppp_asynctty_open(struct tty_struct *tty)
ap->lcp_fcs = -1;
skb_queue_head_init(&ap->rqueue);
- tasklet_init(&ap->tsk, ppp_async_process, (unsigned long) ap);
+ tasklet_setup(&ap->tsk, ppp_async_process);
refcount_set(&ap->refcnt, 1);
init_completion(&ap->dead);
@@ -488,9 +488,9 @@ ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
* to the ppp_generic code, and to tell the ppp_generic code
* if we can accept more output now.
*/
-static void ppp_async_process(unsigned long arg)
+static void ppp_async_process(struct tasklet_struct *t)
{
- struct asyncppp *ap = (struct asyncppp *) arg;
+ struct asyncppp *ap = from_tasklet(ap, t, tsk);
struct sk_buff *skb;
/* process received packets */
diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index 0f338752c..86ee5149f 100644
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -90,7 +90,7 @@ static struct sk_buff* ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *);
static int ppp_sync_send(struct ppp_channel *chan, struct sk_buff *skb);
static int ppp_sync_ioctl(struct ppp_channel *chan, unsigned int cmd,
unsigned long arg);
-static void ppp_sync_process(unsigned long arg);
+static void ppp_sync_process(struct tasklet_struct *t);
static int ppp_sync_push(struct syncppp *ap);
static void ppp_sync_flush_output(struct syncppp *ap);
static void ppp_sync_input(struct syncppp *ap, const unsigned char *buf,
@@ -177,7 +177,7 @@ ppp_sync_open(struct tty_struct *tty)
ap->raccm = ~0U;
skb_queue_head_init(&ap->rqueue);
- tasklet_init(&ap->tsk, ppp_sync_process, (unsigned long) ap);
+ tasklet_setup(&ap->tsk, ppp_sync_process);
refcount_set(&ap->refcnt, 1);
init_completion(&ap->dead_cmp);
@@ -480,9 +480,9 @@ ppp_sync_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
* to the ppp_generic code, and to tell the ppp_generic code
* if we can accept more output now.
*/
-static void ppp_sync_process(unsigned long arg)
+static void ppp_sync_process(struct tasklet_struct *t)
{
- struct syncppp *ap = (struct syncppp *) arg;
+ struct syncppp *ap = from_tasklet(ap, t, tsk);
struct sk_buff *skb;
/* process received packets */
--
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 ` Allen Pais [this message]
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 ` [next-next v3 09/10] net: r8152: " Allen Pais
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-5-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).