提交 ecb2312f 编写于 作者: R Rafael J. Wysocki

gpio / 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 in drivers/gpio/gpio-omap.c.
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: NAlexandre Courbot <acourbot@nvidia.com>
Acked-by: NJavier Martinez Canillas <javier@dowhile0.org>
Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
上级 2d3867d0
...@@ -1259,7 +1259,7 @@ static int omap_gpio_probe(struct platform_device *pdev) ...@@ -1259,7 +1259,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
#ifdef CONFIG_ARCH_OMAP2PLUS #ifdef CONFIG_ARCH_OMAP2PLUS
#if defined(CONFIG_PM_RUNTIME) #if defined(CONFIG_PM)
static void omap_gpio_restore_context(struct gpio_bank *bank); static void omap_gpio_restore_context(struct gpio_bank *bank);
static int omap_gpio_runtime_suspend(struct device *dev) static int omap_gpio_runtime_suspend(struct device *dev)
...@@ -1440,7 +1440,7 @@ static int omap_gpio_runtime_resume(struct device *dev) ...@@ -1440,7 +1440,7 @@ static int omap_gpio_runtime_resume(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
void omap2_gpio_prepare_for_idle(int pwr_mode) void omap2_gpio_prepare_for_idle(int pwr_mode)
{ {
...@@ -1468,7 +1468,7 @@ void omap2_gpio_resume_after_idle(void) ...@@ -1468,7 +1468,7 @@ void omap2_gpio_resume_after_idle(void)
} }
} }
#if defined(CONFIG_PM_RUNTIME) #if defined(CONFIG_PM)
static void omap_gpio_init_context(struct gpio_bank *p) static void omap_gpio_init_context(struct gpio_bank *p)
{ {
struct omap_gpio_reg_offs *regs = p->regs; struct omap_gpio_reg_offs *regs = p->regs;
...@@ -1525,7 +1525,7 @@ static void omap_gpio_restore_context(struct gpio_bank *bank) ...@@ -1525,7 +1525,7 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
writel_relaxed(bank->context.irqenable2, writel_relaxed(bank->context.irqenable2,
bank->base + bank->regs->irqenable2); bank->base + bank->regs->irqenable2);
} }
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
#else #else
#define omap_gpio_runtime_suspend NULL #define omap_gpio_runtime_suspend NULL
#define omap_gpio_runtime_resume NULL #define omap_gpio_runtime_resume NULL
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册