[PATCH net-next v2 08/19] net: phy: mscc: remove the use of .ack_interrupt()

[Ioana Ciornei]

From: Ioana Ciornei <ioana.cior...@nxp.com>

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: Antoine Tenart <aten...@kernel.org>
Signed-off-by: Ioana Ciornei <ioana.cior...@nxp.com>
---
Changes in v2:
 - none

 drivers/net/phy/mscc/mscc_main.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c
index 48883730bf6f..2f2157e3deab 100644
--- a/drivers/net/phy/mscc/mscc_main.c
+++ b/drivers/net/phy/mscc/mscc_main.c
@@ -1923,6 +1923,10 @@ static int vsc85xx_config_intr(struct phy_device *phydev)
        int rc;
 
        if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+               rc = vsc85xx_ack_interrupt(phydev);
+               if (rc)
+                       return rc;
+
                vsc8584_config_macsec_intr(phydev);
                vsc8584_config_ts_intr(phydev);
 
@@ -1933,6 +1937,10 @@ static int vsc85xx_config_intr(struct phy_device *phydev)
                if (rc < 0)
                        return rc;
                rc = phy_read(phydev, MII_VSC85XX_INT_STATUS);
+               if (rc < 0)
+                       return rc;
+
+               rc = vsc85xx_ack_interrupt(phydev);
        }
 
        return rc;
@@ -2338,7 +2346,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .aneg_done      = &genphy_aneg_done,
        .read_status    = &vsc85xx_read_status,
        .handle_interrupt = &vsc8584_handle_interrupt,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2389,7 +2396,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .aneg_done      = &genphy_aneg_done,
        .read_status    = &vsc85xx_read_status,
        .handle_interrupt = &vsc8584_handle_interrupt,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2413,7 +2419,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .aneg_done      = &genphy_aneg_done,
        .read_status    = &vsc85xx_read_status,
        .handle_interrupt = &vsc8584_handle_interrupt,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2437,7 +2442,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .aneg_done      = &genphy_aneg_done,
        .read_status    = &vsc85xx_read_status,
        .handle_interrupt = &vsc8584_handle_interrupt,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
-- 
2.28.0