net: phy: icplus: remove the use .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: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index a74ff45..b632947 100644 (file)
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -272,17 +272,39 @@ static int ip101a_g_config_init(struct phy_device *phydev)
        return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c);
 }
 
+static int ip101a_g_ack_interrupt(struct phy_device *phydev)
+{
+       int err = phy_read(phydev, IP101A_G_IRQ_CONF_STATUS);
+
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
 static int ip101a_g_config_intr(struct phy_device *phydev)
 {
        u16 val;
+       int err;
+
+       if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+               err = ip101a_g_ack_interrupt(phydev);
+               if (err)
+                       return err;
 
-       if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
                /* INTR pin used: Speed/link/duplex will cause an interrupt */
                val = IP101A_G_IRQ_PIN_USED;
-       else
+               err = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, val);
+       } else {
                val = IP101A_G_IRQ_ALL_MASK;
+               err = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, val);
+               if (err)
+                       return err;
+
+               err = ip101a_g_ack_interrupt(phydev);
+       }
 
-       return phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, val);
+       return err;
 }
 
 static irqreturn_t ip101a_g_handle_interrupt(struct phy_device *phydev)
@@ -305,15 +327,6 @@ static irqreturn_t ip101a_g_handle_interrupt(struct phy_device *phydev)
        return IRQ_HANDLED;
 }
 
-static int ip101a_g_ack_interrupt(struct phy_device *phydev)
-{
-       int err = phy_read(phydev, IP101A_G_IRQ_CONF_STATUS);
-       if (err < 0)
-               return err;
-
-       return 0;
-}
-
 static struct phy_driver icplus_driver[] = {
 {
        .phy_id         = 0x02430d80,
@@ -340,7 +353,6 @@ static struct phy_driver icplus_driver[] = {
        /* PHY_BASIC_FEATURES */
        .probe          = ip101a_g_probe,
        .config_intr    = ip101a_g_config_intr,
-       .ack_interrupt  = ip101a_g_ack_interrupt,
        .handle_interrupt = ip101a_g_handle_interrupt,
        .config_init    = &ip101a_g_config_init,
        .suspend        = genphy_suspend,