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/pl111/pl111_display.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/pl111/pl111_display.c 
b/drivers/gpu/drm/pl111/pl111_display.c
index b9fe926a49e8..6d16933ff7e5 100644
--- a/drivers/gpu/drm/pl111/pl111_display.c
+++ b/drivers/gpu/drm/pl111/pl111_display.c
@@ -51,7 +51,7 @@ static enum drm_mode_status
 pl111_mode_valid(struct drm_simple_display_pipe *pipe,
                 const struct drm_display_mode *mode)
 {
-       struct drm_device *drm = pipe->crtc.dev;
+       struct drm_device *drm = pipe->crtc.drm_dev;
        struct pl111_drm_dev_private *priv = drm->dev_private;
        u32 cpp = DIV_ROUND_UP(priv->variant->fb_depth, 8);
        u64 bw;
@@ -122,7 +122,7 @@ static void pl111_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 pl111_drm_dev_private *priv = drm->dev_private;
        const struct drm_display_mode *mode = &cstate->mode;
        struct drm_framebuffer *fb = plane->state->fb;
@@ -357,7 +357,7 @@ static void pl111_display_enable(struct 
drm_simple_display_pipe *pipe,
 static void pl111_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 pl111_drm_dev_private *priv = drm->dev_private;
        u32 cntl;
 
@@ -390,7 +390,7 @@ static void pl111_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 pl111_drm_dev_private *priv = drm->dev_private;
        struct drm_pending_vblank_event *event = crtc->state->event;
        struct drm_plane *plane = &pipe->plane;
@@ -406,19 +406,19 @@ static void pl111_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);
                if (crtc->state->active && drm_crtc_vblank_get(crtc) == 0)
                        drm_crtc_arm_vblank_event(crtc, event);
                else
                        drm_crtc_send_vblank_event(crtc, event);
-               spin_unlock_irq(&crtc->dev->event_lock);
+               spin_unlock_irq(&crtc->drm_dev->event_lock);
        }
 }
 
 static int pl111_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 pl111_drm_dev_private *priv = drm->dev_private;
 
        writel(CLCD_IRQ_NEXTBASE_UPDATE, priv->regs + priv->ienb);
@@ -429,7 +429,7 @@ static int pl111_display_enable_vblank(struct 
drm_simple_display_pipe *pipe)
 static void pl111_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 pl111_drm_dev_private *priv = drm->dev_private;
 
        writel(0, priv->regs + priv->ienb);
-- 
2.39.2

Reply via email to