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/mcde/mcde_display.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/mcde/mcde_display.c 
b/drivers/gpu/drm/mcde/mcde_display.c
index 52043a12a2e8..3d5e3639d4af 100644
--- a/drivers/gpu/drm/mcde/mcde_display.c
+++ b/drivers/gpu/drm/mcde/mcde_display.c
@@ -1154,7 +1154,7 @@ static void mcde_display_enable(struct 
drm_simple_display_pipe *pipe,
 {
        struct drm_crtc *crtc = &pipe->crtc;
        struct drm_plane *plane = &pipe->plane;
-       struct drm_device *drm = crtc->dev;
+       struct drm_device *drm = crtc->drm_dev;
        struct mcde *mcde = to_mcde(drm);
        const struct drm_display_mode *mode = &cstate->mode;
        struct drm_framebuffer *fb = plane->state->fb;
@@ -1300,7 +1300,7 @@ static void mcde_display_enable(struct 
drm_simple_display_pipe *pipe,
 static void mcde_display_disable(struct drm_simple_display_pipe *pipe)
 {
        struct drm_crtc *crtc = &pipe->crtc;
-       struct drm_device *drm = crtc->dev;
+       struct drm_device *drm = crtc->drm_dev;
        struct mcde *mcde = to_mcde(drm);
        struct drm_pending_vblank_event *event;
        int ret;
@@ -1321,9 +1321,9 @@ static void mcde_display_disable(struct 
drm_simple_display_pipe *pipe)
        if (event) {
                crtc->state->event = NULL;
 
-               spin_lock_irq(&crtc->dev->event_lock);
+               spin_lock_irq(&crtc->drm_dev->event_lock);
                drm_crtc_send_vblank_event(crtc, event);
-               spin_unlock_irq(&crtc->dev->event_lock);
+               spin_unlock_irq(&crtc->drm_dev->event_lock);
        }
 
        ret = regulator_disable(mcde->epod);
@@ -1384,7 +1384,7 @@ static void mcde_display_update(struct 
drm_simple_display_pipe *pipe,
                                struct drm_plane_state *old_pstate)
 {
        struct drm_crtc *crtc = &pipe->crtc;
-       struct drm_device *drm = crtc->dev;
+       struct drm_device *drm = crtc->drm_dev;
        struct mcde *mcde = to_mcde(drm);
        struct drm_pending_vblank_event *event = crtc->state->event;
        struct drm_plane *plane = &pipe->plane;
@@ -1399,7 +1399,7 @@ static void mcde_display_update(struct 
drm_simple_display_pipe *pipe,
        if (event) {
                crtc->state->event = NULL;
 
-               spin_lock_irq(&crtc->dev->event_lock);
+               spin_lock_irq(&crtc->drm_dev->event_lock);
                /*
                 * Hardware must be on before we can arm any vblank event,
                 * this is not a scanout controller where there is always
@@ -1415,7 +1415,7 @@ static void mcde_display_update(struct 
drm_simple_display_pipe *pipe,
                        drm_crtc_send_vblank_event(crtc, event);
                }
 
-               spin_unlock_irq(&crtc->dev->event_lock);
+               spin_unlock_irq(&crtc->drm_dev->event_lock);
        }
 
        /*
@@ -1445,7 +1445,7 @@ static void mcde_display_update(struct 
drm_simple_display_pipe *pipe,
 static int mcde_display_enable_vblank(struct drm_simple_display_pipe *pipe)
 {
        struct drm_crtc *crtc = &pipe->crtc;
-       struct drm_device *drm = crtc->dev;
+       struct drm_device *drm = crtc->drm_dev;
        struct mcde *mcde = to_mcde(drm);
        u32 val;
 
@@ -1464,7 +1464,7 @@ static int mcde_display_enable_vblank(struct 
drm_simple_display_pipe *pipe)
 static void mcde_display_disable_vblank(struct drm_simple_display_pipe *pipe)
 {
        struct drm_crtc *crtc = &pipe->crtc;
-       struct drm_device *drm = crtc->dev;
+       struct drm_device *drm = crtc->drm_dev;
        struct mcde *mcde = to_mcde(drm);
 
        /* Disable all VBLANK IRQs */
-- 
2.39.2

Reply via email to