diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-14 17:14:46 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-15 09:12:21 -0500 |
| commit | f2ea5e1708da1bd7cb11c2cd967071e23ec9e347 (patch) | |
| tree | 3c8c2653eb31d2893f3793e78f810514825c96ad | |
| parent | e8a9235c7c9257835a941ce89ea760ee95d94a70 (diff) | |
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>
| -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) | |||
| 951 | 951 | ||
| 952 | #endif | 952 | #endif |
| 953 | 953 | ||
| 954 | #ifdef CONFIG_PM_RUNTIME | ||
| 955 | |||
| 956 | static int pm2xxx_runtime_suspend(struct device *dev) | 954 | static int pm2xxx_runtime_suspend(struct device *dev) |
| 957 | { | 955 | { |
| 958 | struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev); | 956 | struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev); |
| @@ -977,8 +975,6 @@ static int pm2xxx_runtime_resume(struct device *dev) | |||
| 977 | return 0; | 975 | return 0; |
| 978 | } | 976 | } |
| 979 | 977 | ||
| 980 | #endif | ||
| 981 | |||
| 982 | static const struct dev_pm_ops pm2xxx_pm_ops = { | 978 | static const struct dev_pm_ops pm2xxx_pm_ops = { |
| 983 | SET_SYSTEM_SLEEP_PM_OPS(pm2xxx_wall_charger_suspend, | 979 | SET_SYSTEM_SLEEP_PM_OPS(pm2xxx_wall_charger_suspend, |
| 984 | pm2xxx_wall_charger_resume) | 980 | pm2xxx_wall_charger_resume) |
