From: Allen Pais <allen.lkml@gmail.com>
To: jes@trained-monkey.org, davem@davemloft.net, kuba@kernel.org,
kda@linux-powerpc.org, dougmill@linux.ibm.com,
cooldavid@cooldavid.org, mlindner@marvell.com,
borisp@mellanox.com
Cc: keescook@chromium.org, linux-acenic@sunsite.dk,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-rdma@vger.kernel.org,
oss-drivers@netronome.com, Allen Pais <allen.lkml@gmail.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [PATCH 01/20] ethernet: alteon: convert tasklets to use new tasklet_setup() API
Date: Mon, 17 Aug 2020 13:54:14 +0530 [thread overview]
Message-ID: <20200817082434.21176-2-allen.lkml@gmail.com> (raw)
In-Reply-To: <20200817082434.21176-1-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/ethernet/alteon/acenic.c | 9 +++++----
drivers/net/ethernet/alteon/acenic.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index ac86fcae1582..8a4c2319953d 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -1562,10 +1562,11 @@ static void ace_watchdog(struct net_device *data, unsigned int txqueue)
}
-static void ace_tasklet(unsigned long arg)
+static void ace_tasklet(struct tasklet_struct *t)
{
- struct net_device *dev = (struct net_device *) arg;
- struct ace_private *ap = netdev_priv(dev);
+ struct ace_private *ap = from_tasklet(ap, t, ace_tasklet);
+ struct net_device *dev = (struct net_device *)((char *)ap -
+ ALIGN(sizeof(struct net_device), NETDEV_ALIGN));
int cur_size;
cur_size = atomic_read(&ap->cur_rx_bufs);
@@ -2269,7 +2270,7 @@ static int ace_open(struct net_device *dev)
/*
* Setup the bottom half rx ring refill handler
*/
- tasklet_init(&ap->ace_tasklet, ace_tasklet, (unsigned long)dev);
+ tasklet_setup(&ap->ace_tasklet, ace_tasklet);
return 0;
}
diff --git a/drivers/net/ethernet/alteon/acenic.h b/drivers/net/ethernet/alteon/acenic.h
index c670067b1541..4b02c705859c 100644
--- a/drivers/net/ethernet/alteon/acenic.h
+++ b/drivers/net/ethernet/alteon/acenic.h
@@ -776,7 +776,7 @@ static int ace_open(struct net_device *dev);
static netdev_tx_t ace_start_xmit(struct sk_buff *skb,
struct net_device *dev);
static int ace_close(struct net_device *dev);
-static void ace_tasklet(unsigned long dev);
+static void ace_tasklet(struct tasklet_struct *t);
static void ace_dump_trace(struct ace_private *ap);
static void ace_set_multicast_list(struct net_device *dev);
static int ace_change_mtu(struct net_device *dev, int new_mtu);
--
2.17.1
next prev parent reply other threads:[~2020-08-17 8:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 8:24 [PATCH 00/20] ethernet: convert tasklets to use new tasklet_setup() API Allen Pais
2020-08-17 8:24 ` Allen Pais [this message]
2020-08-17 8:24 ` [PATCH] ethernet: cxgb4: " Allen Pais
2020-08-17 8:24 ` [PATCH 02/20] ethernet: amd: " Allen Pais
2020-08-17 8:24 ` [PATCH 03/20] broadcom: cnic: " Allen Pais
2020-08-17 8:24 ` [PATCH 04/20] ethernet: cadence: " Allen Pais
2020-08-17 8:24 ` [PATCH 05/20] ethernet: cavium: " Allen Pais
2020-08-17 8:24 ` [PATCH 06/20] ethernet: chelsio: " Allen Pais
2020-08-17 15:32 ` Jakub Kicinski
2020-08-18 9:14 ` Allen
2020-08-17 8:24 ` [PATCH 07/20] ethernet: dlink: " Allen Pais
2020-08-17 8:24 ` [PATCH 08/20] ethernet: hinic: " Allen Pais
2020-08-17 15:33 ` Jakub Kicinski
2020-08-17 8:24 ` [PATCH 09/20] ethernet: ehea: " Allen Pais
2020-08-17 8:24 ` [PATCH 10/20] ethernet: ibmvnic: " Allen Pais
2020-08-17 8:24 ` [PATCH 11/20] ethernet: jme: " Allen Pais
2020-08-17 8:24 ` [PATCH 12/20] ethernet: marvell: " Allen Pais
2020-08-17 8:24 ` [PATCH 13/20] ethernet: mellanox: " Allen Pais
2020-08-17 8:24 ` [PATCH 14/20] ethernet: micrel: " Allen Pais
2020-08-17 8:24 ` [PATCH 15/20] ethernet: natsemi: " Allen Pais
2020-08-17 8:24 ` [PATCH 16/20] ethernet: netronome: " Allen Pais
2020-08-17 14:15 ` [oss-drivers] " Simon Horman
2020-08-17 8:24 ` [PATCH 17/20] ethernet: ni: " Allen Pais
2020-08-17 8:24 ` [PATCH 18/20] ethernet: qlogic: " Allen Pais
2020-08-17 8:24 ` [PATCH 19/20] ethernet: silan: " Allen Pais
2020-08-17 8:24 ` [PATCH 20/20] ethernet: smsc: " 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=20200817082434.21176-2-allen.lkml@gmail.com \
--to=allen.lkml@gmail.com \
--cc=borisp@mellanox.com \
--cc=cooldavid@cooldavid.org \
--cc=davem@davemloft.net \
--cc=dougmill@linux.ibm.com \
--cc=jes@trained-monkey.org \
--cc=kda@linux-powerpc.org \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-acenic@sunsite.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mlindner@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=romain.perier@gmail.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).