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 20/20] ethernet: smsc: convert tasklets to use new tasklet_setup() API
Date: Mon, 17 Aug 2020 13:54:34 +0530 [thread overview]
Message-ID: <20200817082434.21176-22-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/smsc/smc91x.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 1c4fea9c3ec4..7e585aa3031c 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -535,10 +535,10 @@ static inline void smc_rcv(struct net_device *dev)
/*
* This is called to actually send a packet to the chip.
*/
-static void smc_hardware_send_pkt(unsigned long data)
+static void smc_hardware_send_pkt(struct tasklet_struct *t)
{
- struct net_device *dev = (struct net_device *)data;
- struct smc_local *lp = netdev_priv(dev);
+ struct smc_local *lp = from_tasklet(lp, t, tx_task);
+ struct net_device *dev = lp->dev;
void __iomem *ioaddr = lp->base;
struct sk_buff *skb;
unsigned int packet_no, len;
@@ -688,7 +688,7 @@ smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
* Allocation succeeded: push packet to the chip's own memory
* immediately.
*/
- smc_hardware_send_pkt((unsigned long)dev);
+ smc_hardware_send_pkt(&lp->tx_task);
}
return NETDEV_TX_OK;
@@ -1965,7 +1965,7 @@ static int smc_probe(struct net_device *dev, void __iomem *ioaddr,
dev->netdev_ops = &smc_netdev_ops;
dev->ethtool_ops = &smc_ethtool_ops;
- tasklet_init(&lp->tx_task, smc_hardware_send_pkt, (unsigned long)dev);
+ tasklet_setup(&lp->tx_task, smc_hardware_send_pkt);
INIT_WORK(&lp->phy_configure, smc_phy_configure);
lp->dev = dev;
lp->mii.phy_id_mask = 0x1f;
--
2.17.1
prev parent reply other threads:[~2020-08-17 8:27 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 ` [PATCH 01/20] ethernet: alteon: " Allen Pais
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 ` Allen Pais [this message]
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-22-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).