net: phy: marvell: 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: Maxim Kochetkov <fido_max@inbox.ru>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Robert Hancock <robert.hancock@calian.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index bb843b96043628c9f1c8121cd9c7e3b494da4a06..587930a7f48be042df51fc7ef1decbd434385133 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -317,12 +317,21 @@ static int marvell_config_intr(struct phy_device *phydev)
 {
        int err;
 
-       if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+       if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+               err = marvell_ack_interrupt(phydev);
+               if (err)
+                       return err;
+
                err = phy_write(phydev, MII_M1011_IMASK,
                                MII_M1011_IMASK_INIT);
-       else
+       } else {
                err = phy_write(phydev, MII_M1011_IMASK,
                                MII_M1011_IMASK_CLEAR);
+               if (err)
+                       return err;
+
+               err = marvell_ack_interrupt(phydev);
+       }
 
        return err;
 }
@@ -2703,7 +2712,6 @@ static struct phy_driver marvell_drivers[] = {
                .probe = marvell_probe,
                .config_init = marvell_config_init,
                .config_aneg = m88e1101_config_aneg,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2722,7 +2730,6 @@ static struct phy_driver marvell_drivers[] = {
                .probe = marvell_probe,
                .config_init = m88e1111_config_init,
                .config_aneg = marvell_config_aneg,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2744,7 +2751,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = m88e1111_config_init,
                .config_aneg = m88e1111_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2766,7 +2772,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = m88e1111_config_init,
                .config_aneg = m88e1111_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2787,7 +2792,6 @@ static struct phy_driver marvell_drivers[] = {
                .probe = marvell_probe,
                .config_init = m88e1118_config_init,
                .config_aneg = m88e1118_config_aneg,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2807,7 +2811,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = marvell_config_init,
                .config_aneg = m88e1121_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2829,7 +2832,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = m88e1318_config_init,
                .config_aneg = m88e1318_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .get_wol = m88e1318_get_wol,
@@ -2851,7 +2853,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = m88e1145_config_init,
                .config_aneg = m88e1101_config_aneg,
                .read_status = genphy_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2872,7 +2873,6 @@ static struct phy_driver marvell_drivers[] = {
                .probe = marvell_probe,
                .config_init = m88e1149_config_init,
                .config_aneg = m88e1118_config_aneg,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2891,7 +2891,6 @@ static struct phy_driver marvell_drivers[] = {
                .probe = marvell_probe,
                .config_init = m88e1111_config_init,
                .config_aneg = marvell_config_aneg,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2909,7 +2908,6 @@ static struct phy_driver marvell_drivers[] = {
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
                .config_init = m88e1116r_config_init,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2932,7 +2930,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = m88e1510_config_init,
                .config_aneg = m88e1510_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .get_wol = m88e1318_get_wol,
@@ -2961,7 +2958,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = marvell_config_init,
                .config_aneg = m88e1510_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -2987,7 +2983,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = marvell_config_init,
                .config_aneg = m88e1510_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -3012,7 +3007,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = m88e3016_config_init,
                .aneg_done = marvell_aneg_done,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -3033,7 +3027,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = marvell_config_init,
                .config_aneg = m88e6390_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -3058,7 +3051,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = marvell_config_init,
                .config_aneg = m88e1510_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,
@@ -3080,7 +3072,6 @@ static struct phy_driver marvell_drivers[] = {
                .config_init = marvell_config_init,
                .config_aneg = m88e1510_config_aneg,
                .read_status = marvell_read_status,
-               .ack_interrupt = marvell_ack_interrupt,
                .config_intr = marvell_config_intr,
                .handle_interrupt = marvell_handle_interrupt,
                .resume = genphy_resume,