gpu: arm: midgard: Drop CONFIG_PM_RUNTIME

After commit 464ed18ebdb6 ("PM: Eliminate CONFIG_PM_RUNTIME") PM_RUNTIME
is eliminated.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig
index 852b2b6fb447801e528f809ffc5e17f6a5b453eb..801490f19a209ee66a9f1f4fc3ddf6187e1de2b1 100644 (file)
--- a/drivers/gpu/arm/midgard/Kconfig
+++ b/drivers/gpu/arm/midgard/Kconfig
@@ -42,7 +42,7 @@ config MALI_MIDGARD_DVFS
 config MALI_MIDGARD_RT_PM
        bool "Enable Runtime power management"
        depends on MALI_MIDGARD
-       depends on PM_RUNTIME
+       depends on PM
        default n
        help
          Choose this option to enable runtime power management in the Mali Midgard DDK.

diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 69fddc74e8bd41343566f4a8249a9b397fa4687d..d1d2d5647b786a3064c1cd04c86c49cc6a81250a 100644 (file)
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -3155,7 +3155,6 @@ static int kbase_device_resume(struct device *dev)
  *
  * @return A standard Linux error code
  */
-#ifdef CONFIG_PM_RUNTIME
 static int kbase_device_runtime_suspend(struct device *dev)
 {
        struct kbase_device *kbdev = to_kbase_device(dev);
@@ -3174,7 +3173,6 @@ static int kbase_device_runtime_suspend(struct device *dev)
        }
        return 0;
 }
-#endif /* CONFIG_PM_RUNTIME */
 
 /** Runtime resume callback from the OS.
  *
@@ -3185,7 +3183,6 @@ static int kbase_device_runtime_suspend(struct device *dev)
  * @return A standard Linux error code
  */
 
-#ifdef CONFIG_PM_RUNTIME
 int kbase_device_runtime_resume(struct device *dev)
 {
        int ret = 0;
@@ -3206,7 +3203,6 @@ int kbase_device_runtime_resume(struct device *dev)
 
        return ret;
 }
-#endif /* CONFIG_PM_RUNTIME */
 
 /** Runtime idle callback from the OS.
  *
@@ -3218,24 +3214,22 @@ int kbase_device_runtime_resume(struct device *dev)
  * @return A standard Linux error code
  */
 
-#ifdef CONFIG_PM_RUNTIME
 static int kbase_device_runtime_idle(struct device *dev)
 {
        /* Avoid pm_runtime_suspend being called */
        return 1;
 }
-#endif /* CONFIG_PM_RUNTIME */
 
 /** The power management operations for the platform driver.
  */
 static const struct dev_pm_ops kbase_pm_ops = {
        .suspend = kbase_device_suspend,
        .resume = kbase_device_resume,
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
        .runtime_suspend = kbase_device_runtime_suspend,
        .runtime_resume = kbase_device_runtime_resume,
        .runtime_idle = kbase_device_runtime_idle,
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
 };
 
 #ifdef CONFIG_OF