net: bcmgenet: Remove custom ndo_poll_controller()

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 91f3a7e78d657cbfe1a3d70f00bce6289d4ef5d4..9282403d1bf6612909c1cc023e783521ecf35190 100644 (file)
--- 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,
 };