drm/msm: rename msm_pm_prepare/complete to note the KMS nature

Rename the msm_pm_prepare() and msm_pm_complete() to
msm_kms_pm_prepare() and msm_kms_pm_complete() consequently.

Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/561646/
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 8e7a1ec29951ca0aa8f5eb8e4731113237658dde..a0d658efff4c597f246c9cf7a693283ed7fd12e6 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -1344,8 +1344,8 @@ static const struct dev_pm_ops dpu_pm_ops = {
        SET_RUNTIME_PM_OPS(dpu_runtime_suspend, dpu_runtime_resume, NULL)
        SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
                                pm_runtime_force_resume)
-       .prepare = msm_pm_prepare,
-       .complete = msm_pm_complete,
+       .prepare = msm_kms_pm_prepare,
+       .complete = msm_kms_pm_complete,
 };
 
 static const struct of_device_id dpu_dt_match[] = {

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
index 7ebb4413b852333c340129f27553827196e149c0..f9a0ecd89ff86a3347ceeb155ce3f571f22677f5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
@@ -501,8 +501,8 @@ fail:
 }
 
 static const struct dev_pm_ops mdp4_pm_ops = {
-       .prepare = msm_pm_prepare,
-       .complete = msm_pm_complete,
+       .prepare = msm_kms_pm_prepare,
+       .complete = msm_kms_pm_complete,
 };
 
 static int mdp4_probe(struct platform_device *pdev)

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index 21be30115d15e0c7ad16ed616c54f399774b9c14..150bf9f37120a2370be06bcfd50984f89d851a6f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -961,8 +961,8 @@ static __maybe_unused int mdp5_runtime_resume(struct device *dev)
 
 static const struct dev_pm_ops mdp5_pm_ops = {
        SET_RUNTIME_PM_OPS(mdp5_runtime_suspend, mdp5_runtime_resume, NULL)
-       .prepare = msm_pm_prepare,
-       .complete = msm_pm_complete,
+       .prepare = msm_kms_pm_prepare,
+       .complete = msm_kms_pm_complete,
 };
 
 static const struct of_device_id mdp5_dt_match[] = {

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index c456a468b0269dc6ddd61536ff3c4771df5c4ce8..290389bac7cbf26521b3e68d92d9b6174211ceab 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1098,7 +1098,7 @@ static const struct drm_driver msm_driver = {
        .patchlevel         = MSM_VERSION_PATCHLEVEL,
 };
 
-int msm_pm_prepare(struct device *dev)
+int msm_kms_pm_prepare(struct device *dev)
 {
        struct msm_drm_private *priv = dev_get_drvdata(dev);
        struct drm_device *ddev = priv ? priv->dev : NULL;
@@ -1109,7 +1109,7 @@ int msm_pm_prepare(struct device *dev)
        return drm_mode_config_helper_suspend(ddev);
 }
 
-void msm_pm_complete(struct device *dev)
+void msm_kms_pm_complete(struct device *dev)
 {
        struct msm_drm_private *priv = dev_get_drvdata(dev);
        struct drm_device *ddev = priv ? priv->dev : NULL;

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index ceefb560d9f446f5d1a84cbdc8756f63620b9e33..c69f22fd3f8f24ed71196832a498574135520fbc 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -563,8 +563,8 @@ static inline unsigned long timeout_to_jiffies(const ktime_t *timeout)
 
 extern const struct component_master_ops msm_drm_ops;
 
-int msm_pm_prepare(struct device *dev);
-void msm_pm_complete(struct device *dev);
+int msm_kms_pm_prepare(struct device *dev);
+void msm_kms_pm_complete(struct device *dev);
 
 int msm_drv_probe(struct device *dev,
        int (*kms_init)(struct drm_device *dev),