diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-05 17:32:11 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-05 17:32:11 -0500 |
commit | 2713775bf570b3ccc0f68130e6f1b623c9e191b7 (patch) | |
tree | e52ab7299595dad2c14d27918839a2c41c169c6b /drivers/i2c/busses/i2c-omap.c | |
parent | ee343504f603c112c84e26ca25ed094c55350ef5 (diff) |
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>
Diffstat (limited to 'drivers/i2c/busses/i2c-omap.c')
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 26942c159de1..a1e9afdc2dea 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -1280,7 +1280,6 @@ static int omap_i2c_remove(struct platform_device *pdev) | |||
1280 | } | 1280 | } |
1281 | 1281 | ||
1282 | #ifdef CONFIG_PM | 1282 | #ifdef CONFIG_PM |
1283 | #ifdef CONFIG_PM_RUNTIME | ||
1284 | static int omap_i2c_runtime_suspend(struct device *dev) | 1283 | static int omap_i2c_runtime_suspend(struct device *dev) |
1285 | { | 1284 | { |
1286 | struct platform_device *pdev = to_platform_device(dev); | 1285 | struct platform_device *pdev = to_platform_device(dev); |
@@ -1318,7 +1317,6 @@ static int omap_i2c_runtime_resume(struct device *dev) | |||
1318 | 1317 | ||
1319 | return 0; | 1318 | return 0; |
1320 | } | 1319 | } |
1321 | #endif /* CONFIG_PM_RUNTIME */ | ||
1322 | 1320 | ||
1323 | static struct dev_pm_ops omap_i2c_pm_ops = { | 1321 | static struct dev_pm_ops omap_i2c_pm_ops = { |
1324 | SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend, | 1322 | SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend, |