[PATCH 25/39] drm: renesas: shmobile: Rename shmob_drm_crtc.crtc

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Thu, Jun 22, 2023 at 11:21:37AM +0200, Geert Uytterhoeven wrote:
> Rename the "crtc" member of the shmob_drm_crtc subclass structure to
> "base", to improve readability.

I'm not sure that's more readable to me, but I don't mind :-)

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>

> Signed-off-by: Geert Uytterhoeven <geert+renesas at glider.be>
> ---
>  .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 26 +++++++++----------
>  .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h |  2 +-
>  2 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
> index 3f6af12f45988124..3f0b71253ed929c9 100644
> --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
> +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
> @@ -64,7 +64,7 @@ static void shmob_drm_clk_off(struct shmob_drm_device *sdev)
>  
>  static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)
>  {
> -	struct drm_crtc *crtc = &scrtc->crtc;
> +	struct drm_crtc *crtc = &scrtc->base;
>  	struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
>  	const struct drm_display_info *info = &sdev->connector->display_info;
>  	const struct drm_display_mode *mode = &crtc->mode;
> @@ -152,7 +152,7 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)
>  
>  static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)
>  {
> -	struct shmob_drm_device *sdev = to_shmob_device(scrtc->crtc.dev);
> +	struct shmob_drm_device *sdev = to_shmob_device(scrtc->base.dev);
>  	u32 value;
>  
>  	value = lcdc_read(sdev, LDCNT2R);
> @@ -185,7 +185,7 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)
>   */
>  static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
>  {
> -	struct drm_crtc *crtc = &scrtc->crtc;
> +	struct drm_crtc *crtc = &scrtc->base;
>  	struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
>  	const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;
>  	const struct shmob_drm_format_info *format;
> @@ -272,7 +272,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)
>  
>  static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)
>  {
> -	struct drm_crtc *crtc = &scrtc->crtc;
> +	struct drm_crtc *crtc = &scrtc->base;
>  	struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
>  
>  	if (!scrtc->started)
> @@ -308,7 +308,7 @@ void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc)
>  static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,
>  					int x, int y)
>  {
> -	struct drm_crtc *crtc = &scrtc->crtc;
> +	struct drm_crtc *crtc = &scrtc->base;
>  	struct drm_framebuffer *fb = crtc->primary->fb;
>  	struct drm_gem_dma_object *gem;
>  	unsigned int bpp;
> @@ -329,7 +329,7 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,
>  
>  static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)
>  {
> -	struct drm_crtc *crtc = &scrtc->crtc;
> +	struct drm_crtc *crtc = &scrtc->base;
>  	struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);
>  
>  	shmob_drm_crtc_compute_base(scrtc, crtc->x, crtc->y);
> @@ -343,7 +343,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)
>  
>  static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc)
>  {
> -	return container_of(crtc, struct shmob_drm_crtc, crtc);
> +	return container_of(crtc, struct shmob_drm_crtc, base);
>  }
>  
>  static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode)
> @@ -415,15 +415,15 @@ static const struct drm_crtc_helper_funcs crtc_helper_funcs = {
>  void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc)
>  {
>  	struct drm_pending_vblank_event *event;
> -	struct drm_device *dev = scrtc->crtc.dev;
> +	struct drm_device *dev = scrtc->base.dev;
>  	unsigned long flags;
>  
>  	spin_lock_irqsave(&dev->event_lock, flags);
>  	event = scrtc->event;
>  	scrtc->event = NULL;
>  	if (event) {
> -		drm_crtc_send_vblank_event(&scrtc->crtc, event);
> -		drm_crtc_vblank_put(&scrtc->crtc);
> +		drm_crtc_send_vblank_event(&scrtc->base, event);
> +		drm_crtc_vblank_put(&scrtc->base);
>  	}
>  	spin_unlock_irqrestore(&dev->event_lock, flags);
>  }
> @@ -435,7 +435,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
>  				    struct drm_modeset_acquire_ctx *ctx)
>  {
>  	struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
> -	struct drm_device *dev = scrtc->crtc.dev;
> +	struct drm_device *dev = scrtc->base.dev;
>  	unsigned long flags;
>  
>  	spin_lock_irqsave(&dev->event_lock, flags);
> @@ -450,7 +450,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
>  
>  	if (event) {
>  		event->pipe = 0;
> -		drm_crtc_vblank_get(&scrtc->crtc);
> +		drm_crtc_vblank_get(&scrtc->base);
>  		spin_lock_irqsave(&dev->event_lock, flags);
>  		scrtc->event = event;
>  		spin_unlock_irqrestore(&dev->event_lock, flags);
> @@ -502,7 +502,7 @@ static const struct drm_crtc_funcs crtc_funcs = {
>  
>  int shmob_drm_crtc_create(struct shmob_drm_device *sdev)
>  {
> -	struct drm_crtc *crtc = &sdev->crtc.crtc;
> +	struct drm_crtc *crtc = &sdev->crtc.base;
>  	struct drm_plane *primary, *plane;
>  	unsigned int i;
>  	int ret;
> diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h
> index f507eaf912e16a22..79cce0a0ada4cfce 100644
> --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h
> +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h
> @@ -21,7 +21,7 @@ struct shmob_drm_device;
>  struct shmob_drm_format_info;
>  
>  struct shmob_drm_crtc {
> -	struct drm_crtc crtc;
> +	struct drm_crtc base;
>  
>  	struct drm_pending_vblank_event *event;
>  	int dpms;

-- 
Regards,

Laurent Pinchart