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-koenig@xxxxxxxxxxxxxx> --- drivers/gpu/drm/kmb/kmb_crtc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/kmb/kmb_crtc.c b/drivers/gpu/drm/kmb/kmb_crtc.c index 647872f65bff..5be50909d63b 100644 --- a/drivers/gpu/drm/kmb/kmb_crtc.c +++ b/drivers/gpu/drm/kmb/kmb_crtc.c @@ -28,7 +28,7 @@ struct kmb_crtc_timing { static int kmb_crtc_enable_vblank(struct drm_crtc *crtc) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct kmb_drm_private *kmb = to_kmb(dev); /* Clear interrupt */ @@ -44,7 +44,7 @@ static int kmb_crtc_enable_vblank(struct drm_crtc *crtc) static void kmb_crtc_disable_vblank(struct drm_crtc *crtc) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct kmb_drm_private *kmb = to_kmb(dev); /* Clear interrupt */ @@ -68,7 +68,7 @@ static const struct drm_crtc_funcs kmb_crtc_funcs = { static void kmb_crtc_set_mode(struct drm_crtc *crtc, struct drm_atomic_state *old_state) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct drm_display_mode *m = &crtc->state->adjusted_mode; struct kmb_crtc_timing vm; struct kmb_drm_private *kmb = to_kmb(dev); @@ -158,7 +158,7 @@ static void kmb_crtc_atomic_disable(struct drm_crtc *crtc, static void kmb_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct kmb_drm_private *kmb = to_kmb(dev); kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, @@ -168,13 +168,13 @@ static void kmb_crtc_atomic_begin(struct drm_crtc *crtc, static void kmb_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct kmb_drm_private *kmb = to_kmb(dev); kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, LCD_INT_VERT_COMP); - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); if (crtc->state->event) { if (drm_crtc_vblank_get(crtc) == 0) drm_crtc_arm_vblank_event(crtc, crtc->state->event); @@ -182,7 +182,7 @@ static void kmb_crtc_atomic_flush(struct drm_crtc *crtc, 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); } static enum drm_mode_status @@ -190,7 +190,7 @@ static enum drm_mode_status const struct drm_display_mode *mode) { int refresh; - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; int vfp = mode->vsync_start - mode->vdisplay; if (mode->vdisplay < KMB_CRTC_MAX_HEIGHT) { -- 2.39.2