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> --- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 +++++++++---------- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index 89bed78f1466..4682b17fc5ff 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -159,7 +159,7 @@ static const struct drm_plane_helper_funcs hibmc_plane_helper_funcs = { static void hibmc_crtc_dpms(struct drm_crtc *crtc, u32 dpms) { - struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->dev); + struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->drm_dev); u32 reg; reg = readl(priv->mmio + HIBMC_CRT_DISP_CTL); @@ -175,7 +175,7 @@ static void hibmc_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) { u32 reg; - struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->dev); + struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->drm_dev); hibmc_set_power_mode(priv, HIBMC_PW_MODE_CTL_MODE_MODE0); @@ -194,7 +194,7 @@ static void hibmc_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) { u32 reg; - struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->dev); + struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->drm_dev); hibmc_crtc_dpms(crtc, HIBMC_CRT_DPMS_OFF); drm_crtc_vblank_off(crtc); @@ -361,7 +361,7 @@ static void hibmc_crtc_mode_set_nofb(struct drm_crtc *crtc) { u32 val; struct drm_display_mode *mode = &crtc->state->mode; - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct hibmc_drm_private *priv = to_hibmc_drm_private(dev); u32 width = mode->hsync_end - mode->hsync_start; u32 height = mode->vsync_end - mode->vsync_start; @@ -395,7 +395,7 @@ static void hibmc_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) { u32 reg; - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct hibmc_drm_private *priv = to_hibmc_drm_private(dev); hibmc_set_power_mode(priv, HIBMC_PW_MODE_CTL_MODE_MODE0); @@ -417,16 +417,16 @@ static void hibmc_crtc_atomic_flush(struct drm_crtc *crtc, { unsigned long flags; - spin_lock_irqsave(&crtc->dev->event_lock, flags); + spin_lock_irqsave(&crtc->drm_dev->event_lock, flags); if (crtc->state->event) drm_crtc_send_vblank_event(crtc, crtc->state->event); crtc->state->event = NULL; - spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + spin_unlock_irqrestore(&crtc->drm_dev->event_lock, flags); } static int hibmc_crtc_enable_vblank(struct drm_crtc *crtc) { - struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->dev); + struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->drm_dev); writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(1), priv->mmio + HIBMC_RAW_INTERRUPT_EN); @@ -436,7 +436,7 @@ static int hibmc_crtc_enable_vblank(struct drm_crtc *crtc) static void hibmc_crtc_disable_vblank(struct drm_crtc *crtc) { - struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->dev); + struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->drm_dev); writel(HIBMC_RAW_INTERRUPT_EN_VBLANK(0), priv->mmio + HIBMC_RAW_INTERRUPT_EN); @@ -444,7 +444,7 @@ static void hibmc_crtc_disable_vblank(struct drm_crtc *crtc) static void hibmc_crtc_load_lut(struct drm_crtc *crtc) { - struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->dev); + struct hibmc_drm_private *priv = to_hibmc_drm_private(crtc->drm_dev); void __iomem *mmio = priv->mmio; u16 *r, *g, *b; u32 reg; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 871f79a6b17e..a3cfae5d17dd 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -516,12 +516,12 @@ static void ade_crtc_atomic_flush(struct drm_crtc *crtc, if (event) { crtc->state->event = NULL; - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); if (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); } } -- 2.39.2