aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power/runtime.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/power/runtime.c')
-rw-r--r--drivers/base/power/runtime.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 8f1ab8446caa..5070c4fe8542 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -45,8 +45,6 @@ static pm_callback_t __rpm_get_callback(struct device *dev, size_t cb_offset)
45#define RPM_GET_CALLBACK(dev, callback) \ 45#define RPM_GET_CALLBACK(dev, callback) \
46 __rpm_get_callback(dev, offsetof(struct dev_pm_ops, callback)) 46 __rpm_get_callback(dev, offsetof(struct dev_pm_ops, callback))
47 47
48#ifdef CONFIG_PM_RUNTIME
49
50static int rpm_resume(struct device *dev, int rpmflags); 48static int rpm_resume(struct device *dev, int rpmflags);
51static int rpm_suspend(struct device *dev, int rpmflags); 49static int rpm_suspend(struct device *dev, int rpmflags);
52 50
@@ -1399,7 +1397,6 @@ void pm_runtime_remove(struct device *dev)
1399 if (dev->power.irq_safe && dev->parent) 1397 if (dev->power.irq_safe && dev->parent)
1400 pm_runtime_put(dev->parent); 1398 pm_runtime_put(dev->parent);
1401} 1399}
1402#endif
1403 1400
1404/** 1401/**
1405 * pm_runtime_force_suspend - Force a device into suspend state if needed. 1402 * pm_runtime_force_suspend - Force a device into suspend state if needed.
@@ -1419,12 +1416,6 @@ int pm_runtime_force_suspend(struct device *dev)
1419 int ret = 0; 1416 int ret = 0;
1420 1417
1421 pm_runtime_disable(dev); 1418 pm_runtime_disable(dev);
1422
1423 /*
1424 * Note that pm_runtime_status_suspended() returns false while
1425 * !CONFIG_PM_RUNTIME, which means the device will be put into low
1426 * power state.
1427 */
1428 if (pm_runtime_status_suspended(dev)) 1419 if (pm_runtime_status_suspended(dev))
1429 return 0; 1420 return 0;
1430 1421