Prepare dropping the alias "dev" for struct drm_crtc::drm_dev. "drm_dev"
is the better name as "dev" is usually a struct device pointer.

No semantic changes.

Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
---
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c 
b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index d40142842f85..1a41e49b6848 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -92,11 +92,11 @@ static void mtk_drm_crtc_finish_page_flip(struct 
mtk_drm_crtc *mtk_crtc)
        struct drm_crtc *crtc = &mtk_crtc->base;
        unsigned long flags;
 
-       spin_lock_irqsave(&crtc->dev->event_lock, flags);
+       spin_lock_irqsave(&crtc->drm_dev->event_lock, flags);
        drm_crtc_send_vblank_event(crtc, mtk_crtc->event);
        drm_crtc_vblank_put(crtc);
        mtk_crtc->event = NULL;
-       spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
+       spin_unlock_irqrestore(&crtc->drm_dev->event_lock, flags);
 }
 
 static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
@@ -345,11 +345,11 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc 
*mtk_crtc)
        height = crtc->state->adjusted_mode.vdisplay;
        vrefresh = drm_mode_vrefresh(&crtc->state->adjusted_mode);
 
-       drm_for_each_encoder(encoder, crtc->dev) {
+       drm_for_each_encoder(encoder, crtc->drm_dev) {
                if (encoder->crtc != crtc)
                        continue;
 
-               drm_connector_list_iter_begin(crtc->dev, &conn_iter);
+               drm_connector_list_iter_begin(crtc->drm_dev, &conn_iter);
                drm_for_each_connector_iter(connector, &conn_iter) {
                        if (connector->encoder != encoder)
                                continue;
@@ -360,7 +360,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc 
*mtk_crtc)
                drm_connector_list_iter_end(&conn_iter);
        }
 
-       ret = pm_runtime_resume_and_get(crtc->dev->dev);
+       ret = pm_runtime_resume_and_get(crtc->drm_dev->dev);
        if (ret < 0) {
                DRM_ERROR("Failed to enable power domain: %d\n", ret);
                return ret;
@@ -421,14 +421,14 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc 
*mtk_crtc)
 err_mutex_unprepare:
        mtk_mutex_unprepare(mtk_crtc->mutex);
 err_pm_runtime_put:
-       pm_runtime_put(crtc->dev->dev);
+       pm_runtime_put(crtc->drm_dev->dev);
        return ret;
 }
 
 static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc)
 {
-       struct drm_device *drm = mtk_crtc->base.dev;
        struct drm_crtc *crtc = &mtk_crtc->base;
+       struct drm_device *drm = crtc->drm_dev;
        int i;
 
        for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
@@ -460,10 +460,10 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc 
*mtk_crtc)
        pm_runtime_put(drm->dev);
 
        if (crtc->state->event && !crtc->state->active) {
-               spin_lock_irq(&crtc->dev->event_lock);
+               spin_lock_irq(&crtc->drm_dev->event_lock);
                drm_crtc_send_vblank_event(crtc, crtc->state->event);
                crtc->state->event = NULL;
-               spin_unlock_irq(&crtc->dev->event_lock);
+               spin_unlock_irq(&crtc->drm_dev->event_lock);
        }
 }
 
@@ -549,7 +549,7 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc 
*mtk_crtc,
        struct cmdq_pkt *cmdq_handle = &mtk_crtc->cmdq_handle;
 #endif
        struct drm_crtc *crtc = &mtk_crtc->base;
-       struct mtk_drm_private *priv = crtc->dev->dev_private;
+       struct mtk_drm_private *priv = crtc->drm_dev->dev_private;
        unsigned int pending_planes = 0, pending_async_planes = 0;
        int i;
 
@@ -616,7 +616,7 @@ static void mtk_crtc_ddp_irq(void *data)
 {
        struct drm_crtc *crtc = data;
        struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
-       struct mtk_drm_private *priv = crtc->dev->dev_private;
+       struct mtk_drm_private *priv = crtc->drm_dev->dev_private;
 
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
        if (!priv->data->shadow_register && !mtk_crtc->cmdq_client.chan)
-- 
2.39.2

Reply via email to