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/sti/sti_crtc.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
index 3c7154f2d5f3..ce648439d0a3 100644
--- a/drivers/gpu/drm/sti/sti_crtc.c
+++ b/drivers/gpu/drm/sti/sti_crtc.c
@@ -134,7 +134,7 @@ sti_crtc_mode_set_nofb(struct drm_crtc *crtc)
 static void sti_crtc_atomic_flush(struct drm_crtc *crtc,
                                  struct drm_atomic_state *state)
 {
-       struct drm_device *drm_dev = crtc->dev;
+       struct drm_device *drm_dev = crtc->drm_dev;
        struct sti_mixer *mixer = to_sti_mixer(crtc);
        struct sti_compositor *compo = dev_get_drvdata(mixer->dev);
        struct drm_plane *p;
@@ -209,12 +209,12 @@ static void sti_crtc_atomic_flush(struct drm_crtc *crtc,
        if (event) {
                crtc->state->event = NULL;
 
-               spin_lock_irqsave(&crtc->dev->event_lock, flags);
+               spin_lock_irqsave(&crtc->drm_dev->event_lock, flags);
                if (drm_crtc_vblank_get(crtc) == 0)
                        drm_crtc_arm_vblank_event(crtc, event);
                else
                        drm_crtc_send_vblank_event(crtc, event);
-               spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
+               spin_unlock_irqrestore(&crtc->drm_dev->event_lock, flags);
        }
 }
 
@@ -264,7 +264,7 @@ int sti_crtc_vblank_cb(struct notifier_block *nb,
 
                /* Disable mixer only if all overlay planes (GDP and VDP)
                 * are disabled */
-               list_for_each_entry(p, &crtc->dev->mode_config.plane_list,
+               list_for_each_entry(p, &crtc->drm_dev->mode_config.plane_list,
                                    head) {
                        struct sti_plane *plane = to_sti_plane(p);
 
@@ -280,7 +280,7 @@ int sti_crtc_vblank_cb(struct notifier_block *nb,
 
 static int sti_crtc_enable_vblank(struct drm_crtc *crtc)
 {
-       struct drm_device *dev = crtc->dev;
+       struct drm_device *dev = crtc->drm_dev;
        unsigned int pipe = crtc->index;
        struct sti_private *dev_priv = dev->dev_private;
        struct sti_compositor *compo = dev_priv->compo;
@@ -299,7 +299,7 @@ static int sti_crtc_enable_vblank(struct drm_crtc *crtc)
 
 static void sti_crtc_disable_vblank(struct drm_crtc *crtc)
 {
-       struct drm_device *drm_dev = crtc->dev;
+       struct drm_device *drm_dev = crtc->drm_dev;
        unsigned int pipe = crtc->index;
        struct sti_private *priv = drm_dev->dev_private;
        struct sti_compositor *compo = priv->compo;
@@ -318,7 +318,7 @@ static int sti_crtc_late_register(struct drm_crtc *crtc)
        struct sti_compositor *compo = dev_get_drvdata(mixer->dev);
 
        if (drm_crtc_index(crtc) == 0)
-               sti_compositor_debugfs_init(compo, crtc->dev->primary);
+               sti_compositor_debugfs_init(compo, crtc->drm_dev->primary);
 
        return 0;
 }
-- 
2.39.2

Reply via email to