diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-14 23:14:46 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-15 15:12:21 +0100 |
| commit | f2ea5e1708da1bd7cb11c2cd967071e23ec9e347 (patch) | |
| tree | 3c8c2653eb31d2893f3793e78f810514825c96ad /drivers/power | |
| parent | NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM (diff) | |
| download | linux-f2ea5e1708da1bd7cb11c2cd967071e23ec9e347.tar.xz linux-f2ea5e1708da1bd7cb11c2cd967071e23ec9e347.zip | |
power / PM: Eliminate CONFIG_PM_RUNTIME
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>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/pm2301_charger.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index 62c15af58c9a..777324992c59 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -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) |