aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-03 19:03:40 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-03 19:03:40 -0500
commitecb2312fa3c1f9792bf8a81c21ea4e011f4a2a90 (patch)
tree82a8deaa35df5dda238edfa6ac43f4c59f9c521c
parent2d3867d0b15beb7d835b58e98830d5af18d646ef (diff)
gpio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
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 in drivers/gpio/gpio-omap.c. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Javier Martinez Canillas <javier@dowhile0.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-omap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 415682f69214..3d6b445665ad 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1259,7 +1259,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
1259 1259
1260#ifdef CONFIG_ARCH_OMAP2PLUS 1260#ifdef CONFIG_ARCH_OMAP2PLUS
1261 1261
1262#if defined(CONFIG_PM_RUNTIME) 1262#if defined(CONFIG_PM)
1263static void omap_gpio_restore_context(struct gpio_bank *bank); 1263static void omap_gpio_restore_context(struct gpio_bank *bank);
1264 1264
1265static int omap_gpio_runtime_suspend(struct device *dev) 1265static int omap_gpio_runtime_suspend(struct device *dev)
@@ -1440,7 +1440,7 @@ static int omap_gpio_runtime_resume(struct device *dev)
1440 1440
1441 return 0; 1441 return 0;
1442} 1442}
1443#endif /* CONFIG_PM_RUNTIME */ 1443#endif /* CONFIG_PM */
1444 1444
1445void omap2_gpio_prepare_for_idle(int pwr_mode) 1445void omap2_gpio_prepare_for_idle(int pwr_mode)
1446{ 1446{
@@ -1468,7 +1468,7 @@ void omap2_gpio_resume_after_idle(void)
1468 } 1468 }
1469} 1469}
1470 1470
1471#if defined(CONFIG_PM_RUNTIME) 1471#if defined(CONFIG_PM)
1472static void omap_gpio_init_context(struct gpio_bank *p) 1472static void omap_gpio_init_context(struct gpio_bank *p)
1473{ 1473{
1474 struct omap_gpio_reg_offs *regs = p->regs; 1474 struct omap_gpio_reg_offs *regs = p->regs;
@@ -1525,7 +1525,7 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
1525 writel_relaxed(bank->context.irqenable2, 1525 writel_relaxed(bank->context.irqenable2,
1526 bank->base + bank->regs->irqenable2); 1526 bank->base + bank->regs->irqenable2);
1527} 1527}
1528#endif /* CONFIG_PM_RUNTIME */ 1528#endif /* CONFIG_PM */
1529#else 1529#else
1530#define omap_gpio_runtime_suspend NULL 1530#define omap_gpio_runtime_suspend NULL
1531#define omap_gpio_runtime_resume NULL 1531#define omap_gpio_runtime_resume NULL