power / PM: Eliminate CONFIG_PM_RUNTIME
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 14 Dec 2014 22:14:46 +0000 (23:14 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 15 Dec 2014 14:12:21 +0000 (15:12 +0100)
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME within #ifdef blocks depending on
CONFIG_PM may be dropped now.

Do that in drivers/power/pm2301_charger.c.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/power/pm2301_charger.c

index 62c15af58c9af37420ab81e889b6f3d61021086d..777324992c59b225d8c6ac54eab47c97688b4bc0 100644 (file)
@@ -951,8 +951,6 @@ static int pm2xxx_wall_charger_suspend(struct device *dev)
 
 #endif
 
-#ifdef CONFIG_PM_RUNTIME
-
 static int  pm2xxx_runtime_suspend(struct device *dev)
 {
        struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
@@ -977,8 +975,6 @@ static int  pm2xxx_runtime_resume(struct device *dev)
        return 0;
 }
 
-#endif
-
 static const struct dev_pm_ops pm2xxx_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(pm2xxx_wall_charger_suspend,
                pm2xxx_wall_charger_resume)