| Message ID | 2857906.7ft1XTNUKe@vostro.rjw.lan (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On Thu, 04 Dec 2014, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > 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 may now be changed to depend on > CONFIG_PM. > > Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under > drivers/mfd/. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > > Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if > PM_SLEEP is selected) which is only in linux-next at the moment (via the > linux-pm tree). > > Please let me know if it is OK to take this one into linux-pm. It's okay to take the patch. Acked-by: Lee Jones <lee.jones@linaro.org> > --- > drivers/mfd/ab8500-gpadc.c | 2 +- > drivers/mfd/arizona-core.c | 4 ++-- > drivers/mfd/wm8994-core.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > Index: linux-pm/drivers/mfd/ab8500-gpadc.c > =================================================================== > --- linux-pm.orig/drivers/mfd/ab8500-gpadc.c > +++ linux-pm/drivers/mfd/ab8500-gpadc.c > @@ -867,7 +867,7 @@ static void ab8500_gpadc_read_calibratio > gpadc->cal_data[ADC_INPUT_VBAT].offset); > } > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int ab8500_gpadc_runtime_suspend(struct device *dev) > { > struct ab8500_gpadc *gpadc = dev_get_drvdata(dev); > Index: linux-pm/drivers/mfd/wm8994-core.c > =================================================================== > --- linux-pm.orig/drivers/mfd/wm8994-core.c > +++ linux-pm/drivers/mfd/wm8994-core.c > @@ -116,7 +116,7 @@ static const char *wm8958_main_supplies[ > "SPKVDD2", > }; > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int wm8994_suspend(struct device *dev) > { > struct wm8994 *wm8994 = dev_get_drvdata(dev); > Index: linux-pm/drivers/mfd/arizona-core.c > =================================================================== > --- linux-pm.orig/drivers/mfd/arizona-core.c > +++ linux-pm/drivers/mfd/arizona-core.c > @@ -330,7 +330,7 @@ err_fll: > return err; > } > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int arizona_runtime_resume(struct device *dev) > { > struct arizona *arizona = dev_get_drvdata(dev); > @@ -1024,7 +1024,7 @@ int arizona_dev_init(struct arizona *ari > goto err_irq; > } > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > regulator_disable(arizona->dcvdd); > #endif > >
On Thu, Dec 4, 2014 at 1:54 AM, Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > 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 may now be changed to depend on > CONFIG_PM. > > Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under > drivers/mfd/. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-pm/drivers/mfd/ab8500-gpadc.c =================================================================== --- linux-pm.orig/drivers/mfd/ab8500-gpadc.c +++ linux-pm/drivers/mfd/ab8500-gpadc.c @@ -867,7 +867,7 @@ static void ab8500_gpadc_read_calibratio gpadc->cal_data[ADC_INPUT_VBAT].offset); } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int ab8500_gpadc_runtime_suspend(struct device *dev) { struct ab8500_gpadc *gpadc = dev_get_drvdata(dev); Index: linux-pm/drivers/mfd/wm8994-core.c =================================================================== --- linux-pm.orig/drivers/mfd/wm8994-core.c +++ linux-pm/drivers/mfd/wm8994-core.c @@ -116,7 +116,7 @@ static const char *wm8958_main_supplies[ "SPKVDD2", }; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int wm8994_suspend(struct device *dev) { struct wm8994 *wm8994 = dev_get_drvdata(dev); Index: linux-pm/drivers/mfd/arizona-core.c =================================================================== --- linux-pm.orig/drivers/mfd/arizona-core.c +++ linux-pm/drivers/mfd/arizona-core.c @@ -330,7 +330,7 @@ err_fll: return err; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int arizona_runtime_resume(struct device *dev) { struct arizona *arizona = dev_get_drvdata(dev); @@ -1024,7 +1024,7 @@ int arizona_dev_init(struct arizona *ari goto err_irq; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM regulator_disable(arizona->dcvdd); #endif