Commit 0d2e778e authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: replace PHY_HAS_INTERRUPT with a check for config_intr and ack_interrupt

Flag PHY_HAS_INTERRUPT is used only here for this small check. I think
using interrupts isn't possible if a driver defines neither
config_intr nor ack_interrupts callback. So we can replace checking
flag PHY_HAS_INTERRUPT with checking for these callbacks.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e15e067d
...@@ -2074,6 +2074,11 @@ static void of_set_phy_eee_broken(struct phy_device *phydev) ...@@ -2074,6 +2074,11 @@ static void of_set_phy_eee_broken(struct phy_device *phydev)
phydev->eee_broken_modes = broken; phydev->eee_broken_modes = broken;
} }
static bool phy_drv_supports_irq(struct phy_driver *phydrv)
{
return phydrv->config_intr || phydrv->ack_interrupt;
}
/** /**
* phy_probe - probe and init a PHY device * phy_probe - probe and init a PHY device
* @dev: device to probe and init * @dev: device to probe and init
...@@ -2095,8 +2100,7 @@ static int phy_probe(struct device *dev) ...@@ -2095,8 +2100,7 @@ static int phy_probe(struct device *dev)
/* Disable the interrupt if the PHY doesn't support it /* Disable the interrupt if the PHY doesn't support it
* but the interrupt is still a valid one * but the interrupt is still a valid one
*/ */
if (!(phydrv->flags & PHY_HAS_INTERRUPT) && if (!phy_drv_supports_irq(phydrv) && phy_interrupt_is_valid(phydev))
phy_interrupt_is_valid(phydev))
phydev->irq = PHY_POLL; phydev->irq = PHY_POLL;
if (phydrv->flags & PHY_IS_INTERNAL) if (phydrv->flags & PHY_IS_INTERNAL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment