Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 48bb9fe4 authored Dec 05, 2014 by Rafael J. Wysocki

MFD / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM



After commit b2b49ccb (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: Lee Jones <lee.jones@linaro.org>

parent bbd6d050

drivers/mfd/ab8500-gpadc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -867,7 +867,7 @@ static void ab8500_gpadc_read_calibration_data(struct ab8500_gpadc *gpadc)
		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);

drivers/mfd/arizona-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 *arizona)
		goto err_irq;
		}

		#ifdef CONFIG_PM_RUNTIME
		#ifdef CONFIG_PM
		regulator_disable(arizona->dcvdd);
		#endif

drivers/mfd/wm8994-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);