net: phy: microchip: remove the use of .ack_interrupt()

In preparation of removing the .ack_interrupt() callback, we must replace
its occurrences (aka phy_clear_interrupt), from the 2 places where it is
called from (phy_enable_interrupts and phy_disable_interrupts), with
equivalent functionality.

This means that clearing interrupts now becomes something that the PHY
driver is responsible of doing, before enabling interrupts and after
clearing them. Make this driver follow the new contract.

Cc: Nisar Sayed <Nisar.Sayed@microchip.com>
Cc: Yuiko Oshino <yuiko.oshino@microchip.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c
index b472a21..9f1f2b6 100644 (file)
--- a/drivers/net/phy/microchip.c
+++ b/drivers/net/phy/microchip.c
@@ -44,14 +44,12 @@ static int lan88xx_phy_config_intr(struct phy_device *phydev)
                               LAN88XX_INT_MASK_LINK_CHANGE_);
        } else {
                rc = phy_write(phydev, LAN88XX_INT_MASK, 0);
-       }
-
-       return rc < 0 ? rc : 0;
-}
+               if (rc)
+                       return rc;
 
-static int lan88xx_phy_ack_interrupt(struct phy_device *phydev)
-{
-       int rc = phy_read(phydev, LAN88XX_INT_STS);
+               /* Ack interrupts after they have been disabled */
+               rc = phy_read(phydev, LAN88XX_INT_STS);
+       }
 
        return rc < 0 ? rc : 0;
 }
@@ -358,7 +356,6 @@ static struct phy_driver microchip_phy_driver[] = {
        .config_init    = lan88xx_config_init,
        .config_aneg    = lan88xx_config_aneg,
 
-       .ack_interrupt  = lan88xx_phy_ack_interrupt,
        .config_intr    = lan88xx_phy_config_intr,
        .handle_interrupt = lan88xx_handle_interrupt,
 

diff --git a/drivers/net/phy/microchip_t1.c b/drivers/net/phy/microchip_t1.c
index 04cda88..4dc00bd 100644 (file)
--- a/drivers/net/phy/microchip_t1.c
+++ b/drivers/net/phy/microchip_t1.c
@@ -189,16 +189,14 @@ static int lan87xx_phy_config_intr(struct phy_device *phydev)
                rc = phy_write(phydev, LAN87XX_INTERRUPT_MASK, 0x7FFF);
                rc = phy_read(phydev, LAN87XX_INTERRUPT_SOURCE);
                val = LAN87XX_MASK_LINK_UP | LAN87XX_MASK_LINK_DOWN;
-       }
-
-       rc = phy_write(phydev, LAN87XX_INTERRUPT_MASK, val);
-
-       return rc < 0 ? rc : 0;
-}
+               rc = phy_write(phydev, LAN87XX_INTERRUPT_MASK, val);
+       } else {
+               rc = phy_write(phydev, LAN87XX_INTERRUPT_MASK, val);
+               if (rc)
+                       return rc;
 
-static int lan87xx_phy_ack_interrupt(struct phy_device *phydev)
-{
-       int rc = phy_read(phydev, LAN87XX_INTERRUPT_SOURCE);
+               rc = phy_read(phydev, LAN87XX_INTERRUPT_SOURCE);
+       }
 
        return rc < 0 ? rc : 0;
 }
@@ -238,7 +236,6 @@ static struct phy_driver microchip_t1_phy_driver[] = {
 
                .config_init    = lan87xx_config_init,
 
-               .ack_interrupt  = lan87xx_phy_ack_interrupt,
                .config_intr    = lan87xx_phy_config_intr,
                .handle_interrupt = lan87xx_handle_interrupt,