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/tegra/dc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 6e78416e64b0..05504fe99a77 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1717,7 +1717,7 @@ static struct drm_info_list debugfs_files[] = { static int tegra_dc_late_register(struct drm_crtc *crtc) { unsigned int i, count = ARRAY_SIZE(debugfs_files); - struct drm_minor *minor = crtc->dev->primary; + struct drm_minor *minor = crtc->drm_dev->primary; struct dentry *root; struct tegra_dc *dc = to_tegra_dc(crtc); @@ -1743,7 +1743,7 @@ static int tegra_dc_late_register(struct drm_crtc *crtc) static void tegra_dc_early_unregister(struct drm_crtc *crtc) { unsigned int count = ARRAY_SIZE(debugfs_files); - struct drm_minor *minor = crtc->dev->primary; + struct drm_minor *minor = crtc->drm_dev->primary; struct tegra_dc *dc = to_tegra_dc(crtc); drm_debugfs_remove_files(dc->debugfs_files, count, minor); @@ -2119,14 +2119,14 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc, tegra_dc_stats_reset(&dc->stats); drm_crtc_vblank_off(crtc); - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); if (crtc->state->event) { 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); err = host1x_client_suspend(&dc->client); if (err < 0) @@ -2279,14 +2279,14 @@ static void tegra_crtc_atomic_begin(struct drm_crtc *crtc, tegra_crtc_update_memory_bandwidth(crtc, state, true); if (crtc->state->event) { - 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_send_vblank_event(crtc, crtc->state->event); else drm_crtc_arm_vblank_event(crtc, crtc->state->event); - spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + spin_unlock_irqrestore(&crtc->drm_dev->event_lock, flags); crtc->state->event = NULL; } -- 2.39.2