From: Allen Pais <allen.lkml@gmail.com>
To: davem@davemloft.net
Cc: jes@trained-monkey.org, kuba@kernel.org, dougmill@linux.ibm.com,
cooldavid@cooldavid.org, mlindner@marvell.com,
stephen@networkplumber.org, borisp@mellanox.com,
netdev@vger.kernel.org, Allen Pais <allen.lkml@gmail.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [PATCH v2 14/20] ethernet: micrel: convert tasklets to use new tasklet_setup() API
Date: Wed, 9 Sep 2020 14:15:04 +0530 [thread overview]
Message-ID: <20200909084510.648706-15-allen.lkml@gmail.com> (raw)
In-Reply-To: <20200909084510.648706-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/micrel/ks8842.c | 19 ++++++++++---------
drivers/net/ethernet/micrel/ksz884x.c | 14 ++++++--------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index f3f6dfe3eddc..8fd32f98c494 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -587,10 +587,11 @@ static int __ks8842_start_new_rx_dma(struct net_device *netdev)
return err;
}
-static void ks8842_rx_frame_dma_tasklet(unsigned long arg)
+static void ks8842_rx_frame_dma_tasklet(struct tasklet_struct *t)
{
- struct net_device *netdev = (struct net_device *)arg;
- struct ks8842_adapter *adapter = netdev_priv(netdev);
+ struct ks8842_adapter *adapter = from_tasklet(adapter, t, dma_rx.tasklet);
+ struct net_device *netdev = (struct net_device *)((char *)adapter -
+ ALIGN(sizeof(struct net_device), NETDEV_ALIGN));
struct ks8842_rx_dma_ctl *ctl = &adapter->dma_rx;
struct sk_buff *skb = ctl->skb;
dma_addr_t addr = sg_dma_address(&ctl->sg);
@@ -720,10 +721,11 @@ static void ks8842_handle_rx_overrun(struct net_device *netdev,
netdev->stats.rx_fifo_errors++;
}
-static void ks8842_tasklet(unsigned long arg)
+static void ks8842_tasklet(struct tasklet_struct *t)
{
- struct net_device *netdev = (struct net_device *)arg;
- struct ks8842_adapter *adapter = netdev_priv(netdev);
+ struct ks8842_adapter *adapter = from_tasklet(adapter, t, tasklet);
+ struct net_device *netdev = (struct net_device *)((char *)adapter -
+ ALIGN(sizeof(struct net_device), NETDEV_ALIGN));
u16 isr;
unsigned long flags;
u16 entry_bank;
@@ -953,8 +955,7 @@ static int ks8842_alloc_dma_bufs(struct net_device *netdev)
goto err;
}
- tasklet_init(&rx_ctl->tasklet, ks8842_rx_frame_dma_tasklet,
- (unsigned long)netdev);
+ tasklet_setup(&rx_ctl->tasklet, ks8842_rx_frame_dma_tasklet);
return 0;
err:
@@ -1173,7 +1174,7 @@ static int ks8842_probe(struct platform_device *pdev)
adapter->dma_tx.channel = -1;
}
- tasklet_init(&adapter->tasklet, ks8842_tasklet, (unsigned long)netdev);
+ tasklet_setup(&adapter->tasklet, ks8842_tasklet);
spin_lock_init(&adapter->lock);
netdev->netdev_ops = &ks8842_netdev_ops;
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index bb646b65cc95..5130507bbf54 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -5159,9 +5159,9 @@ static int dev_rcv_special(struct dev_info *hw_priv)
return received;
}
-static void rx_proc_task(unsigned long data)
+static void rx_proc_task(struct tasklet_struct *t)
{
- struct dev_info *hw_priv = (struct dev_info *) data;
+ struct dev_info *hw_priv = from_tasklet(hw_priv, t, rx_tasklet);
struct ksz_hw *hw = &hw_priv->hw;
if (!hw->enabled)
@@ -5181,9 +5181,9 @@ static void rx_proc_task(unsigned long data)
}
}
-static void tx_proc_task(unsigned long data)
+static void tx_proc_task(struct tasklet_struct *t)
{
- struct dev_info *hw_priv = (struct dev_info *) data;
+ struct dev_info *hw_priv = from_tasklet(hw_priv, t, tx_tasklet);
struct ksz_hw *hw = &hw_priv->hw;
hw_ack_intr(hw, KS884X_INT_TX_MASK);
@@ -5436,10 +5436,8 @@ static int prepare_hardware(struct net_device *dev)
rc = request_irq(dev->irq, netdev_intr, IRQF_SHARED, dev->name, dev);
if (rc)
return rc;
- tasklet_init(&hw_priv->rx_tasklet, rx_proc_task,
- (unsigned long) hw_priv);
- tasklet_init(&hw_priv->tx_tasklet, tx_proc_task,
- (unsigned long) hw_priv);
+ tasklet_setup(&hw_priv->rx_tasklet, rx_proc_task);
+ tasklet_setup(&hw_priv->tx_tasklet, tx_proc_task);
hw->promiscuous = 0;
hw->all_multi = 0;
--
2.25.1
next prev parent reply other threads:[~2020-09-09 8:46 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 8:44 [PATCH v2 00/20] ethernet: convert tasklets to use new Allen Pais
2020-09-09 8:44 ` [PATCH v2 01/20] ethernet: alteon: convert tasklets to use new tasklet_setup() API Allen Pais
2020-09-09 18:09 ` David Miller
2020-09-09 18:36 ` Allen
2020-09-09 21:33 ` David Miller
2020-09-11 5:53 ` Allen
2020-09-11 10:00 ` Allen
2020-09-11 20:20 ` David Miller
2020-09-09 8:44 ` [PATCH v2 02/20] ethernet: amd: " Allen Pais
2020-09-09 8:44 ` [PATCH v2 03/20] broadcom: cnic: " Allen Pais
2020-09-09 8:44 ` [PATCH v2 04/20] ethernet: cadence: " Allen Pais
2020-09-09 8:44 ` [PATCH v2 05/20] ethernet: cavium: " Allen Pais
2020-09-09 8:44 ` [PATCH v2 06/20] ethernet: chelsio: " Allen Pais
2020-09-09 8:44 ` [PATCH v2 07/20] ethernet: dlink: " Allen Pais
2020-09-09 18:11 ` David Miller
2020-09-09 8:44 ` [PATCH v2 08/20] ethernet: hinic: " Allen Pais
2020-09-09 8:44 ` [PATCH v2 09/20] ethernet: ehea: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 10/20] ethernet: ibmvnic: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 11/20] ethernet: jme: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 12/20] ethernet: marvell: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 13/20] ethernet: mellanox: " Allen Pais
2020-09-09 8:45 ` Allen Pais [this message]
2020-09-09 8:45 ` [PATCH v2 15/20] ethernet: natsemi: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 16/20] ethernet: netronome: " Allen Pais
2020-09-09 15:46 ` Jakub Kicinski
2020-09-09 16:28 ` Simon Horman
2020-09-09 8:45 ` [PATCH v2 17/20] ethernet: ni: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 18/20] ethernet: qlogic: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 19/20] ethernet: silan: " Allen Pais
2020-09-09 8:45 ` [PATCH v2 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=20200909084510.648706-15-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=kuba@kernel.org \
--cc=mlindner@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=romain.perier@gmail.com \
--cc=stephen@networkplumber.org \
/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).