i2c-omap / PM: Drop CONFIG_PM_RUNTIME from i2c-omap.c
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Dec 2014 22:32:11 +0000 (23:32 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Dec 2014 22:32:11 +0000 (23:32 +0100)
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so some #ifdef blocks
depending on CONFIG_PM_RUNTIME may be dropped now.

Do that in drivers/i2c/busses/i2c-omap.c.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-omap.c

index 26942c159de1252c867d1b63ba7f6820c60c1402..a1e9afdc2dead75fe2b426719f7c74ad03c81b8d 100644 (file)
@@ -1280,7 +1280,6 @@ static int omap_i2c_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-#ifdef CONFIG_PM_RUNTIME
 static int omap_i2c_runtime_suspend(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
@@ -1318,7 +1317,6 @@ static int omap_i2c_runtime_resume(struct device *dev)
 
        return 0;
 }
-#endif /* CONFIG_PM_RUNTIME */
 
 static struct dev_pm_ops omap_i2c_pm_ops = {
        SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend,