.../net/ethernet/broadcom/genet/bcmgenet.c | 20 ------------------- 1 file changed, 20 deletions(-)
The driver gained a .ndo_poll_controller() at a time where the TX
cleaning process was always done from NAPI which makes this unnecessary.
See commit ac3d9dd034e5 ("netpoll: make ndo_poll_controller() optional")
for more background.
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
.../net/ethernet/broadcom/genet/bcmgenet.c | 20 -------------------
1 file changed, 20 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 91f3a7e78d65..9282403d1bf6 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3247,23 +3247,6 @@ static irqreturn_t bcmgenet_wol_isr(int irq, void *dev_id)
return IRQ_HANDLED;
}
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void bcmgenet_poll_controller(struct net_device *dev)
-{
- struct bcmgenet_priv *priv = netdev_priv(dev);
-
- /* Invoke the main RX/TX interrupt handler */
- disable_irq(priv->irq0);
- bcmgenet_isr0(priv->irq0, priv);
- enable_irq(priv->irq0);
-
- /* And the interrupt handler for RX/TX priority queues */
- disable_irq(priv->irq1);
- bcmgenet_isr1(priv->irq1, priv);
- enable_irq(priv->irq1);
-}
-#endif
-
static void bcmgenet_umac_reset(struct bcmgenet_priv *priv)
{
u32 reg;
@@ -3720,9 +3703,6 @@ static const struct net_device_ops bcmgenet_netdev_ops = {
.ndo_set_mac_address = bcmgenet_set_mac_addr,
.ndo_eth_ioctl = phy_do_ioctl_running,
.ndo_set_features = bcmgenet_set_features,
-#ifdef CONFIG_NET_POLL_CONTROLLER
- .ndo_poll_controller = bcmgenet_poll_controller,
-#endif
.ndo_get_stats = bcmgenet_get_stats,
.ndo_change_carrier = bcmgenet_change_carrier,
};
--
2.34.1
Hello:
This patch was applied to netdev/net-next.git (main)
by David S. Miller <davem@davemloft.net>:
On Thu, 5 Oct 2023 11:17:47 -0700 you wrote:
> The driver gained a .ndo_poll_controller() at a time where the TX
> cleaning process was always done from NAPI which makes this unnecessary.
> See commit ac3d9dd034e5 ("netpoll: make ndo_poll_controller() optional")
> for more background.
>
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
>
> [...]
Here is the summary with links:
- [net-next] net: bcmgenet: Remove custom ndo_poll_controller()
https://git.kernel.org/netdev/net-next/c/19537e125cc7
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
On Thu, Oct 5, 2023 at 8:19 PM Florian Fainelli
<florian.fainelli@broadcom.com> wrote:
>
> The driver gained a .ndo_poll_controller() at a time where the TX
> cleaning process was always done from NAPI which makes this unnecessary.
> See commit ac3d9dd034e5 ("netpoll: make ndo_poll_controller() optional")
> for more background.
>
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Yes, many drivers should do the same...
© 2016 - 2026 Red Hat, Inc.