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/imx/dcss/dcss-crtc.c | 20 ++++++++++---------- drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 15 ++++++++------- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 16 ++++++++-------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/imx/dcss/dcss-crtc.c b/drivers/gpu/drm/imx/dcss/dcss-crtc.c index 31267c00782f..e85ceceb8ca4 100644 --- a/drivers/gpu/drm/imx/dcss/dcss-crtc.c +++ b/drivers/gpu/drm/imx/dcss/dcss-crtc.c @@ -16,7 +16,7 @@ static int dcss_enable_vblank(struct drm_crtc *crtc) { struct dcss_crtc *dcss_crtc = container_of(crtc, struct dcss_crtc, base); - struct dcss_dev *dcss = crtc->dev->dev_private; + struct dcss_dev *dcss = crtc->drm_dev->dev_private; dcss_dtg_vblank_irq_enable(dcss->dtg, true); @@ -31,7 +31,7 @@ static void dcss_disable_vblank(struct drm_crtc *crtc) { struct dcss_crtc *dcss_crtc = container_of(crtc, struct dcss_crtc, base); - struct dcss_dev *dcss = dcss_crtc->base.dev->dev_private; + struct dcss_dev *dcss = dcss_crtc->base.drm_dev->dev_private; disable_irq_nosync(dcss_crtc->irq); @@ -63,15 +63,15 @@ static void dcss_crtc_atomic_flush(struct drm_crtc *crtc, { struct dcss_crtc *dcss_crtc = container_of(crtc, struct dcss_crtc, base); - struct dcss_dev *dcss = dcss_crtc->base.dev->dev_private; + struct dcss_dev *dcss = dcss_crtc->base.drm_dev->dev_private; - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); if (crtc->state->event) { WARN_ON(drm_crtc_vblank_get(crtc)); drm_crtc_arm_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); if (dcss_dtg_is_enabled(dcss->dtg)) dcss_ctxld_enable(dcss->ctxld); @@ -84,7 +84,7 @@ static void dcss_crtc_atomic_enable(struct drm_crtc *crtc, crtc); struct dcss_crtc *dcss_crtc = container_of(crtc, struct dcss_crtc, base); - struct dcss_dev *dcss = dcss_crtc->base.dev->dev_private; + struct dcss_dev *dcss = dcss_crtc->base.drm_dev->dev_private; struct drm_display_mode *mode = &crtc->state->adjusted_mode; struct drm_display_mode *old_mode = &old_crtc_state->adjusted_mode; struct videomode vm; @@ -120,18 +120,18 @@ static void dcss_crtc_atomic_disable(struct drm_crtc *crtc, crtc); struct dcss_crtc *dcss_crtc = container_of(crtc, struct dcss_crtc, base); - struct dcss_dev *dcss = dcss_crtc->base.dev->dev_private; + struct dcss_dev *dcss = dcss_crtc->base.drm_dev->dev_private; struct drm_display_mode *mode = &crtc->state->adjusted_mode; struct drm_display_mode *old_mode = &old_crtc_state->adjusted_mode; drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, false); - 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); dcss_dtg_ctxld_kick_irq_enable(dcss->dtg, true); @@ -168,7 +168,7 @@ static const struct drm_crtc_helper_funcs dcss_helper_funcs = { static irqreturn_t dcss_crtc_irq_handler(int irq, void *dev_id) { struct dcss_crtc *dcss_crtc = dev_id; - struct dcss_dev *dcss = dcss_crtc->base.dev->dev_private; + struct dcss_dev *dcss = dcss_crtc->base.drm_dev->dev_private; if (!dcss_dtg_vblank_irq_valid(dcss->dtg)) return IRQ_NONE; diff --git a/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c index 5f26090b0c98..7ef9ff303e0b 100644 --- a/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c @@ -99,12 +99,12 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc, drm_crtc_vblank_off(crtc); - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); if (crtc->state->event && !crtc->state->active) { 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 void imx_drm_crtc_reset(struct drm_crtc *crtc) @@ -192,11 +192,12 @@ static irqreturn_t ipu_irq_handler(int irq, void *dev_id) } if (i == ARRAY_SIZE(ipu_crtc->plane)) { - spin_lock_irqsave(&crtc->dev->event_lock, flags); + spin_lock_irqsave(&crtc->drm_dev->event_lock, flags); drm_crtc_send_vblank_event(crtc, ipu_crtc->event); ipu_crtc->event = NULL; drm_crtc_vblank_put(crtc); - spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + spin_unlock_irqrestore(&crtc->drm_dev->event_lock, + flags); } } @@ -247,7 +248,7 @@ static void ipu_crtc_atomic_begin(struct drm_crtc *crtc, static void ipu_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); if (crtc->state->event) { struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc); @@ -255,12 +256,12 @@ static void ipu_crtc_atomic_flush(struct drm_crtc *crtc, ipu_crtc->event = crtc->state->event; crtc->state->event = NULL; } - spin_unlock_irq(&crtc->dev->event_lock); + spin_unlock_irq(&crtc->drm_dev->event_lock); } static void ipu_crtc_mode_set_nofb(struct drm_crtc *crtc) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct drm_encoder *encoder; struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc); struct drm_display_mode *mode = &crtc->state->adjusted_mode; diff --git a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c index 277ead6a459a..71c82df2d994 100644 --- a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c +++ b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c @@ -140,7 +140,7 @@ static void imx_lcdc_update_hw_registers(struct drm_simple_display_pipe *pipe, struct drm_crtc *crtc = &pipe->crtc; struct drm_plane_state *new_state = pipe->plane.state; struct drm_framebuffer *fb = new_state->fb; - struct imx_lcdc *lcdc = imx_lcdc_from_drmdev(pipe->crtc.dev); + struct imx_lcdc *lcdc = imx_lcdc_from_drmdev(pipe->crtc.drm_dev); u32 lpcr, lvcr, lhcr; u32 framesize; dma_addr_t addr; @@ -193,7 +193,7 @@ static void imx_lcdc_pipe_enable(struct drm_simple_display_pipe *pipe, int ret; int clk_div; int bpp; - struct imx_lcdc *lcdc = imx_lcdc_from_drmdev(pipe->crtc.dev); + struct imx_lcdc *lcdc = imx_lcdc_from_drmdev(pipe->crtc.drm_dev); struct drm_display_mode *mode = &pipe->crtc.mode; struct drm_display_info *disp_info = &lcdc->connector->display_info; const int hsync_pol = (mode->flags & DRM_MODE_FLAG_PHSYNC) ? 0 : 1; @@ -229,12 +229,12 @@ static void imx_lcdc_pipe_enable(struct drm_simple_display_pipe *pipe, ret = clk_prepare_enable(lcdc->clk_ipg); if (ret) { - dev_err(pipe->crtc.dev->dev, "Cannot enable ipg clock: %pe\n", ERR_PTR(ret)); + dev_err(pipe->crtc.drm_dev->dev, "Cannot enable ipg clock: %pe\n", ERR_PTR(ret)); return; } ret = clk_prepare_enable(lcdc->clk_ahb); if (ret) { - dev_err(pipe->crtc.dev->dev, "Cannot enable ahb clock: %pe\n", ERR_PTR(ret)); + dev_err(pipe->crtc.drm_dev->dev, "Cannot enable ahb clock: %pe\n", ERR_PTR(ret)); clk_disable_unprepare(lcdc->clk_ipg); @@ -249,7 +249,7 @@ static void imx_lcdc_pipe_enable(struct drm_simple_display_pipe *pipe, static void imx_lcdc_pipe_disable(struct drm_simple_display_pipe *pipe) { - struct imx_lcdc *lcdc = imx_lcdc_from_drmdev(pipe->crtc.dev); + struct imx_lcdc *lcdc = imx_lcdc_from_drmdev(pipe->crtc.drm_dev); struct drm_crtc *crtc = &lcdc->pipe.crtc; struct drm_pending_vblank_event *event; @@ -281,7 +281,7 @@ static int imx_lcdc_pipe_check(struct drm_simple_display_pipe *pipe, if (mode->hdisplay < LCDC_MIN_XRES || mode->hdisplay > LCDC_MAX_XRES || mode->vdisplay < LCDC_MIN_YRES || mode->vdisplay > LCDC_MAX_YRES || mode->hdisplay % 0x10) { /* must be multiple of 16 */ - drm_err(pipe->crtc.dev, "unsupported display mode (%u x %u)\n", + drm_err(pipe->crtc.drm_dev, "unsupported display mode (%u x %u)\n", mode->hdisplay, mode->vdisplay); return -EINVAL; } @@ -314,14 +314,14 @@ static void imx_lcdc_pipe_update(struct drm_simple_display_pipe *pipe, if (event) { crtc->state->event = NULL; - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); if (crtc->state->active && 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