net: phy: ste10Xp: 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.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/ste10Xp.c b/drivers/net/phy/ste10Xp.c
index 9f31533..431fe5e 100644 (file)
--- a/drivers/net/phy/ste10Xp.c
+++ b/drivers/net/phy/ste10Xp.c
@@ -48,32 +48,37 @@ static int ste10Xp_config_init(struct phy_device *phydev)
        return 0;
 }
 
+static int ste10Xp_ack_interrupt(struct phy_device *phydev)
+{
+       int err = phy_read(phydev, MII_XCIIS);
+
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
 static int ste10Xp_config_intr(struct phy_device *phydev)
 {
-       int err, value;
+       int err;
 
        if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+               /* clear any pending interrupts */
+               err = ste10Xp_ack_interrupt(phydev);
+               if (err)
+                       return err;
+
                /* Enable all STe101P interrupts (PR12) */
                err = phy_write(phydev, MII_XIE, MII_XIE_DEFAULT_MASK);
-               /* clear any pending interrupts */
-               if (err == 0) {
-                       value = phy_read(phydev, MII_XCIIS);
-                       if (value < 0)
-                               err = value;
-               }
-       } else
+       } else {
                err = phy_write(phydev, MII_XIE, 0);
+               if (err)
+                       return err;
 
-       return err;
-}
-
-static int ste10Xp_ack_interrupt(struct phy_device *phydev)
-{
-       int err = phy_read(phydev, MII_XCIIS);
-       if (err < 0)
-               return err;
+               err = ste10Xp_ack_interrupt(phydev);
+       }
 
-       return 0;
+       return err;
 }
 
 static irqreturn_t ste10Xp_handle_interrupt(struct phy_device *phydev)
@@ -101,7 +106,6 @@ static struct phy_driver ste10xp_pdriver[] = {
        .name = "STe101p",
        /* PHY_BASIC_FEATURES */
        .config_init = ste10Xp_config_init,
-       .ack_interrupt = ste10Xp_ack_interrupt,
        .config_intr = ste10Xp_config_intr,
        .handle_interrupt = ste10Xp_handle_interrupt,
        .suspend = genphy_suspend,
@@ -112,7 +116,6 @@ static struct phy_driver ste10xp_pdriver[] = {
        .name = "STe100p",
        /* PHY_BASIC_FEATURES */
        .config_init = ste10Xp_config_init,
-       .ack_interrupt = ste10Xp_ack_interrupt,
        .config_intr = ste10Xp_config_intr,
        .handle_interrupt = ste10Xp_handle_interrupt,
        .suspend = genphy_suspend,