diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-03 19:04:55 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-03 19:04:55 -0500 |
commit | 06453edba4bfe54a4d17ae5cbdda39cb59ed4c6a (patch) | |
tree | d39814f7869353fa2b2092eb96440adcb1fec0fa | |
parent | ecb2312fa3c1f9792bf8a81c21ea4e011f4a2a90 (diff) |
drm / exynos / 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 4 files under
gpu/drm/exynos/.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c index 68d38eb6774d..835b6af00970 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c | |||
@@ -1817,7 +1817,7 @@ static int fimc_resume(struct device *dev) | |||
1817 | } | 1817 | } |
1818 | #endif | 1818 | #endif |
1819 | 1819 | ||
1820 | #ifdef CONFIG_PM_RUNTIME | 1820 | #ifdef CONFIG_PM |
1821 | static int fimc_runtime_suspend(struct device *dev) | 1821 | static int fimc_runtime_suspend(struct device *dev) |
1822 | { | 1822 | { |
1823 | struct fimc_context *ctx = get_fimc_context(dev); | 1823 | struct fimc_context *ctx = get_fimc_context(dev); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 6ff8599f6cbf..81a250830808 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c | |||
@@ -1540,7 +1540,7 @@ static int g2d_resume(struct device *dev) | |||
1540 | } | 1540 | } |
1541 | #endif | 1541 | #endif |
1542 | 1542 | ||
1543 | #ifdef CONFIG_PM_RUNTIME | 1543 | #ifdef CONFIG_PM |
1544 | static int g2d_runtime_suspend(struct device *dev) | 1544 | static int g2d_runtime_suspend(struct device *dev) |
1545 | { | 1545 | { |
1546 | struct g2d_data *g2d = dev_get_drvdata(dev); | 1546 | struct g2d_data *g2d = dev_get_drvdata(dev); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c index c6a013fc321c..0261468c8019 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c | |||
@@ -1764,7 +1764,7 @@ static int gsc_resume(struct device *dev) | |||
1764 | } | 1764 | } |
1765 | #endif | 1765 | #endif |
1766 | 1766 | ||
1767 | #ifdef CONFIG_PM_RUNTIME | 1767 | #ifdef CONFIG_PM |
1768 | static int gsc_runtime_suspend(struct device *dev) | 1768 | static int gsc_runtime_suspend(struct device *dev) |
1769 | { | 1769 | { |
1770 | struct gsc_context *ctx = get_gsc_context(dev); | 1770 | struct gsc_context *ctx = get_gsc_context(dev); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c index b6a37d4f5b13..425e70625388 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c | |||
@@ -822,7 +822,7 @@ static int rotator_resume(struct device *dev) | |||
822 | } | 822 | } |
823 | #endif | 823 | #endif |
824 | 824 | ||
825 | #ifdef CONFIG_PM_RUNTIME | 825 | #ifdef CONFIG_PM |
826 | static int rotator_runtime_suspend(struct device *dev) | 826 | static int rotator_runtime_suspend(struct device *dev) |
827 | { | 827 | { |
828 | struct rot_context *rot = dev_get_drvdata(dev); | 828 | struct rot_context *rot = dev_get_drvdata(dev); |