| Message ID | d6f37c41-76f1-56ce-0047-c44224b7ff96@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: phy: check for implementation of both callbacks in phy_drv_supports_irq | expand |
On 11/12/18 12:16 PM, Heiner Kallweit wrote: > Now that the icplus driver has been fixed all PHY drivers supporting > interrupts have both callbacks (config_intr and ack_interrupt) > implemented - as it should be. Therefore phy_drv_supports_irq() > can be changed now to check for both callbacks being implemented. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
From: Heiner Kallweit <hkallweit1@gmail.com> Date: Mon, 12 Nov 2018 21:16:06 +0100 > Now that the icplus driver has been fixed all PHY drivers supporting > interrupts have both callbacks (config_intr and ack_interrupt) > implemented - as it should be. Therefore phy_drv_supports_irq() > can be changed now to check for both callbacks being implemented. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Applied, thanks Heiner.
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 55202a0ac..e06613f2d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2122,7 +2122,7 @@ static void of_set_phy_eee_broken(struct phy_device *phydev) static bool phy_drv_supports_irq(struct phy_driver *phydrv) { - return phydrv->config_intr || phydrv->ack_interrupt; + return phydrv->config_intr && phydrv->ack_interrupt; } /**
Now that the icplus driver has been fixed all PHY drivers supporting interrupts have both callbacks (config_intr and ack_interrupt) implemented - as it should be. Therefore phy_drv_supports_irq() can be changed now to check for both callbacks being implemented. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/phy/phy_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)