net: phy: mscc: implement generic .handle_interrupt() callback

In an attempt to actually support shared IRQs in phylib, we now move the
responsibility of triggering the phylib state machine or just returning
IRQ_NONE, based on the IRQ status register, to the PHY driver. Having
3 different IRQ handling callbacks (.handle_interrupt(),
.did_interrupt() and .ack_interrupt() ) is confusing so let the PHY
driver implement directly an IRQ handler like any other device driver.
Make this driver follow the new convention.

Also, remove the .did_interrupt() callback since it's not anymore used.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Tested-by: Vladimir Oltean <olteanv@gmail.com> # VSC8514
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c
index b705121..4888373 100644 (file)
--- a/drivers/net/phy/mscc/mscc_main.c
+++ b/drivers/net/phy/mscc/mscc_main.c
@@ -1541,16 +1541,6 @@ static int vsc85xx_config_init(struct phy_device *phydev)
        return 0;
 }
 
-static int vsc8584_did_interrupt(struct phy_device *phydev)
-{
-       int rc = 0;
-
-       if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
-               rc = phy_read(phydev, MII_VSC85XX_INT_STATUS);
-
-       return (rc < 0) ? 0 : rc & MII_VSC85XX_INT_MASK_MASK;
-}
-
 static int vsc8514_config_pre_init(struct phy_device *phydev)
 {
        /* These are the settings to override the silicon default
@@ -1948,6 +1938,24 @@ static int vsc85xx_config_intr(struct phy_device *phydev)
        return rc;
 }
 
+static irqreturn_t vsc85xx_handle_interrupt(struct phy_device *phydev)
+{
+       int irq_status;
+
+       irq_status = phy_read(phydev, MII_VSC85XX_INT_STATUS);
+       if (irq_status < 0) {
+               phy_error(phydev);
+               return IRQ_NONE;
+       }
+
+       if (!(irq_status & MII_VSC85XX_INT_MASK_MASK))
+               return IRQ_NONE;
+
+       phy_trigger_machine(phydev);
+
+       return IRQ_HANDLED;
+}
+
 static int vsc85xx_config_aneg(struct phy_device *phydev)
 {
        int rc;
@@ -2114,7 +2122,7 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc85xx_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2139,9 +2147,8 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_aneg    = &vsc85xx_config_aneg,
        .aneg_done      = &genphy_aneg_done,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8574_probe,
@@ -2163,7 +2170,7 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc8514_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2187,7 +2194,7 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc85xx_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2211,7 +2218,7 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc85xx_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2235,7 +2242,7 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc85xx_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2259,7 +2266,7 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc85xx_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
@@ -2283,9 +2290,8 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc8584_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8574_probe,
@@ -2308,9 +2314,8 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_init    = &vsc8584_config_init,
        .config_aneg    = &vsc85xx_config_aneg,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8584_probe,
@@ -2335,7 +2340,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .handle_interrupt = &vsc8584_handle_interrupt,
        .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8574_probe,
@@ -2359,9 +2363,8 @@ static struct phy_driver vsc85xx_driver[] = {
        .config_aneg    = &vsc85xx_config_aneg,
        .aneg_done      = &genphy_aneg_done,
        .read_status    = &vsc85xx_read_status,
-       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .handle_interrupt = vsc85xx_handle_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8574_probe,
@@ -2388,7 +2391,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .handle_interrupt = &vsc8584_handle_interrupt,
        .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8584_probe,
@@ -2413,7 +2415,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .handle_interrupt = &vsc8584_handle_interrupt,
        .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8584_probe,
@@ -2438,7 +2439,6 @@ static struct phy_driver vsc85xx_driver[] = {
        .handle_interrupt = &vsc8584_handle_interrupt,
        .ack_interrupt  = &vsc85xx_ack_interrupt,
        .config_intr    = &vsc85xx_config_intr,
-       .did_interrupt  = &vsc8584_did_interrupt,
        .suspend        = &genphy_suspend,
        .resume         = &genphy_resume,
        .probe          = &vsc8584_probe,