Skip to content

Commit d650d12

Browse files
ffainelligregkh
authored andcommitted
net: bcmgenet: Remove custom ndo_poll_controller()
[ Upstream commit 19537e1 ] 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 ac3d9dd ("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> Signed-off-by: David S. Miller <davem@davemloft.net> Stable-dep-of: 5393b2b ("net: bcmgenet: fix racing timeout handler") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2a74590 commit d650d12

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

drivers/net/ethernet/broadcom/genet/bcmgenet.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,23 +3255,6 @@ static irqreturn_t bcmgenet_wol_isr(int irq, void *dev_id)
32553255
return IRQ_HANDLED;
32563256
}
32573257

3258-
#ifdef CONFIG_NET_POLL_CONTROLLER
3259-
static void bcmgenet_poll_controller(struct net_device *dev)
3260-
{
3261-
struct bcmgenet_priv *priv = netdev_priv(dev);
3262-
3263-
/* Invoke the main RX/TX interrupt handler */
3264-
disable_irq(priv->irq0);
3265-
bcmgenet_isr0(priv->irq0, priv);
3266-
enable_irq(priv->irq0);
3267-
3268-
/* And the interrupt handler for RX/TX priority queues */
3269-
disable_irq(priv->irq1);
3270-
bcmgenet_isr1(priv->irq1, priv);
3271-
enable_irq(priv->irq1);
3272-
}
3273-
#endif
3274-
32753258
static void bcmgenet_umac_reset(struct bcmgenet_priv *priv)
32763259
{
32773260
u32 reg;
@@ -3741,9 +3724,6 @@ static const struct net_device_ops bcmgenet_netdev_ops = {
37413724
.ndo_set_mac_address = bcmgenet_set_mac_addr,
37423725
.ndo_eth_ioctl = phy_do_ioctl_running,
37433726
.ndo_set_features = bcmgenet_set_features,
3744-
#ifdef CONFIG_NET_POLL_CONTROLLER
3745-
.ndo_poll_controller = bcmgenet_poll_controller,
3746-
#endif
37473727
.ndo_get_stats = bcmgenet_get_stats,
37483728
.ndo_change_carrier = bcmgenet_change_carrier,
37493729
};

0 commit comments

Comments
 (0)