Merge tag 'pm-5.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[muen/linux.git] / drivers / base / power / main.c
index 929bc9d..f80d298 100644 (file)
@@ -736,7 +736,7 @@ void dpm_noirq_resume_devices(pm_message_t state)
                reinit_completion(&dev->power.completion);
                if (is_async(dev)) {
                        get_device(dev);
-                       async_schedule(async_resume_noirq, dev);
+                       async_schedule_dev(async_resume_noirq, dev);
                }
        }
 
@@ -893,7 +893,7 @@ void dpm_resume_early(pm_message_t state)
                reinit_completion(&dev->power.completion);
                if (is_async(dev)) {
                        get_device(dev);
-                       async_schedule(async_resume_early, dev);
+                       async_schedule_dev(async_resume_early, dev);
                }
        }
 
@@ -1057,7 +1057,7 @@ void dpm_resume(pm_message_t state)
                reinit_completion(&dev->power.completion);
                if (is_async(dev)) {
                        get_device(dev);
-                       async_schedule(async_resume, dev);
+                       async_schedule_dev(async_resume, dev);
                }
        }
 
@@ -1377,7 +1377,7 @@ static int device_suspend_noirq(struct device *dev)
 
        if (is_async(dev)) {
                get_device(dev);
-               async_schedule(async_suspend_noirq, dev);
+               async_schedule_dev(async_suspend_noirq, dev);
                return 0;
        }
        return __device_suspend_noirq(dev, pm_transition, false);
@@ -1580,7 +1580,7 @@ static int device_suspend_late(struct device *dev)
 
        if (is_async(dev)) {
                get_device(dev);
-               async_schedule(async_suspend_late, dev);
+               async_schedule_dev(async_suspend_late, dev);
                return 0;
        }
 
@@ -1846,7 +1846,7 @@ static int device_suspend(struct device *dev)
 
        if (is_async(dev)) {
                get_device(dev);
-               async_schedule(async_suspend, dev);
+               async_schedule_dev(async_suspend, dev);
                return 0;
        }