Migrate tasklet APIs to the new bottom half workqueue mechanism. It
replaces all occurrences of tasklet usage with the appropriate workqueue
APIs throughout the cavium/octeon driver. This transition ensures
compatibility with the latest design and enhances performance.
Signed-off-by: Allen Pais <allen.lkml@xxxxxxxxx>
---
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index 744f2434f7fa..0db993c1cc36 100644
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -13,6 +13,7 @@
#include <linux/net_tstamp.h>
#include <linux/interrupt.h>
#include <linux/netdevice.h>
+#include <linux/workqueue.h>
#include <linux/spinlock.h>
#include <linux/if_vlan.h>
#include <linux/of_mdio.h>
@@ -144,7 +145,7 @@ struct octeon_mgmt {
unsigned int last_speed;
struct device *dev;
struct napi_struct napi;
- struct tasklet_struct tx_clean_tasklet;
+ struct work_struct tx_clean_bh_work;
struct device_node *phy_np;
resource_size_t mix_phys;
resource_size_t mix_size;
@@ -315,9 +316,9 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)
netif_wake_queue(p->netdev);
}
-static void octeon_mgmt_clean_tx_tasklet(struct tasklet_struct *t)
+static void octeon_mgmt_clean_tx_bh_work(struct work_struct *work)
{
- struct octeon_mgmt *p = from_tasklet(p, t, tx_clean_tasklet);
+ struct octeon_mgmt *p = from_work(p, work, tx_clean_bh_work);
octeon_mgmt_clean_tx_buffers(p);
octeon_mgmt_enable_tx_irq(p);
}
@@ -684,7 +685,7 @@ static irqreturn_t octeon_mgmt_interrupt(int cpl, void *dev_id)
}
if (mixx_isr.s.orthresh) {
octeon_mgmt_disable_tx_irq(p);
- tasklet_schedule(&p->tx_clean_tasklet);
+ queue_work(system_bh_wq, &p->tx_clean_bh_work);
}
return IRQ_HANDLED;
@@ -1487,8 +1488,8 @@ static int octeon_mgmt_probe(struct platform_device *pdev)
skb_queue_head_init(&p->tx_list);
skb_queue_head_init(&p->rx_list);
- tasklet_setup(&p->tx_clean_tasklet,
- octeon_mgmt_clean_tx_tasklet);
+ INIT_WORK(&p->tx_clean_bh_work,
+ octeon_mgmt_clean_tx_bh_work);
netdev->priv_flags |= IFF_UNICAST_FLT;
--
2.34.1
