unify flush_work/flush_work_keventd and rename it to cancel_work_sync

[mirror_ubuntu-artful-kernel.git] / drivers / net / phy / phy.c

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index f445c465b14e8b55be3d8945c42c9dd9ba68de13..f71dab347667cd3fc33b408aaa55c0fdf7e4e570 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -663,9 +663,9 @@ int phy_stop_interrupts(struct phy_device *phydev)
 
        /*
         * Finish any pending work; we might have been scheduled to be called
-        * from keventd ourselves, but flush_work_keventd() handles that.
+        * from keventd ourselves, but cancel_work_sync() handles that.
         */
-       flush_work_keventd(&phydev->phy_queue);
+       cancel_work_sync(&phydev->phy_queue);
 
        free_irq(phydev->irq, phydev);