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/tidss/tidss_crtc.c | 19 ++++++++++--------- drivers/gpu/drm/tidss/tidss_irq.c | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c index 5e5e466f35d1..d3399d6ca5e5 100644 --- a/drivers/gpu/drm/tidss/tidss_crtc.c +++ b/drivers/gpu/drm/tidss/tidss_crtc.c @@ -20,7 +20,7 @@ static void tidss_crtc_finish_page_flip(struct tidss_crtc *tcrtc) { - struct drm_device *ddev = tcrtc->crtc.dev; + struct drm_device *ddev = tcrtc->crtc.drm_dev; struct tidss_device *tidss = to_tidss(ddev); struct drm_pending_vblank_event *event; unsigned long flags; @@ -75,7 +75,8 @@ void tidss_crtc_error_irq(struct drm_crtc *crtc, u64 irqstatus) { struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); - dev_err_ratelimited(crtc->dev->dev, "CRTC%u SYNC LOST: (irq %llx)\n", + dev_err_ratelimited(crtc->drm_dev->dev, + "CRTC%u SYNC LOST: (irq %llx)\n", tcrtc->hw_videoport, irqstatus); } @@ -86,7 +87,7 @@ static int tidss_crtc_atomic_check(struct drm_crtc *crtc, { struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); struct dispc_device *dispc = tidss->dispc; struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); @@ -165,7 +166,7 @@ static void tidss_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc); struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); unsigned long flags; @@ -218,7 +219,7 @@ static void tidss_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc); struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); const struct drm_display_mode *mode = &crtc->state->adjusted_mode; unsigned long flags; @@ -261,7 +262,7 @@ static void tidss_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) { struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); unsigned long flags; @@ -297,7 +298,7 @@ enum drm_mode_status tidss_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode) { struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); return dispc_vp_mode_valid(tidss->dispc, tcrtc->hw_videoport, mode); @@ -316,7 +317,7 @@ static const struct drm_crtc_helper_funcs tidss_crtc_helper_funcs = { static int tidss_crtc_enable_vblank(struct drm_crtc *crtc) { - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); dev_dbg(ddev->dev, "%s\n", __func__); @@ -330,7 +331,7 @@ static int tidss_crtc_enable_vblank(struct drm_crtc *crtc) static void tidss_crtc_disable_vblank(struct drm_crtc *crtc) { - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); dev_dbg(ddev->dev, "%s\n", __func__); diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c index 0c681c7600bc..a30964e02a57 100644 --- a/drivers/gpu/drm/tidss/tidss_irq.c +++ b/drivers/gpu/drm/tidss/tidss_irq.c @@ -25,7 +25,7 @@ static void tidss_irq_update(struct tidss_device *tidss) void tidss_irq_enable_vblank(struct drm_crtc *crtc) { - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); u32 hw_videoport = tcrtc->hw_videoport; @@ -40,7 +40,7 @@ void tidss_irq_enable_vblank(struct drm_crtc *crtc) void tidss_irq_disable_vblank(struct drm_crtc *crtc) { - struct drm_device *ddev = crtc->dev; + struct drm_device *ddev = crtc->drm_dev; struct tidss_device *tidss = to_tidss(ddev); struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); u32 hw_videoport = tcrtc->hw_videoport; -- 2.39.2