浏览代码

i2c-omap / PM: Drop CONFIG_PM_RUNTIME from i2c-omap.c

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>
Rafael J. Wysocki 10 年之前
父节点
当前提交
2713775bf5
共有 1 个文件被更改,包括 0 次插入2 次删除
  1. 0 2
      drivers/i2c/busses/i2c-omap.c

+ 0 - 2
drivers/i2c/busses/i2c-omap.c

@@ -1280,7 +1280,6 @@ static int omap_i2c_remove(struct platform_device *pdev)
 }
 }
 
 
 #ifdef CONFIG_PM
 #ifdef CONFIG_PM
-#ifdef CONFIG_PM_RUNTIME
 static int omap_i2c_runtime_suspend(struct device *dev)
 static int omap_i2c_runtime_suspend(struct device *dev)
 {
 {
 	struct platform_device *pdev = to_platform_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;
 	return 0;
 }
 }
-#endif /* CONFIG_PM_RUNTIME */
 
 
 static struct dev_pm_ops omap_i2c_pm_ops = {
 static struct dev_pm_ops omap_i2c_pm_ops = {
 	SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend,
 	SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend,