Make use of new helper phy_polling_mode().

Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
 drivers/net/phy/phy.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 914fe8e6..7ade22a7 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -519,7 +519,7 @@ static int phy_start_aneg_priv(struct phy_device *phydev, 
bool sync)
         * negotiation may already be done and aneg interrupt may not be
         * generated.
         */
-       if (phydev->irq != PHY_POLL && phydev->state == PHY_AN) {
+       if (!phy_polling_mode(phydev) && phydev->state == PHY_AN) {
                err = phy_aneg_done(phydev);
                if (err > 0) {
                        trigger = true;
@@ -977,7 +977,7 @@ void phy_state_machine(struct work_struct *work)
                        needs_aneg = true;
                break;
        case PHY_NOLINK:
-               if (phydev->irq != PHY_POLL)
+               if (!phy_polling_mode(phydev))
                        break;
 
                err = phy_read_status(phydev);
@@ -1018,7 +1018,7 @@ void phy_state_machine(struct work_struct *work)
                /* Only register a CHANGE if we are polling and link changed
                 * since latest checking.
                 */
-               if (phydev->irq == PHY_POLL) {
+               if (phy_polling_mode(phydev)) {
                        old_link = phydev->link;
                        err = phy_read_status(phydev);
                        if (err)
@@ -1117,7 +1117,7 @@ void phy_state_machine(struct work_struct *work)
         * PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving
         * between states from phy_mac_interrupt()
         */
-       if (phydev->irq == PHY_POLL)
+       if (phy_polling_mode(phydev))
                queue_delayed_work(system_power_efficient_wq, 
&phydev->state_queue,
                                   PHY_STATE_TIME * HZ);
 }
-- 
2.18.0


Reply via email to