[PATCH 13/36] drm/arm: remove _unlocked suffix in drm_object_put_unlocked

[Liviu Dudau]

On Thu, May 07, 2020 at 04:07:59PM +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Spelling out _unlocked for each and every driver is a annoying.
> Especially if we consider how many drivers, do not know (or need to)
> about the horror stories involving struct_mutex.
> 
> Just drop the suffix. It makes the API cleaner.
> 
> Done via the following script:
> 
> __from=drm_gem_object_put_unlocked
> __to=drm_gem_object_put
> for __file in $(git grep --name-only $__from); do
>   sed -i  "s/$__from/$__to/g" $__file;
> done
> 
> Cc: Liviu Dudau <liviu.dudau at arm.com>

Acked-by: Liviu Dudau <liviu.dudau at arm.com>

Thanks for the cleanup!

Best regards,
Liviu

> Cc: Brian Starkey <brian.starkey at arm.com>
> Cc: David Airlie <airlied at linux.ie>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c | 6 +++---
>  drivers/gpu/drm/arm/malidp_drv.c                        | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
> index 1b01a625f40e..170f9dc8ec19 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
> @@ -19,7 +19,7 @@ static void komeda_fb_destroy(struct drm_framebuffer *fb)
>  	u32 i;
>  
>  	for (i = 0; i < fb->format->num_planes; i++)
> -		drm_gem_object_put_unlocked(fb->obj[i]);
> +		drm_gem_object_put(fb->obj[i]);
>  
>  	drm_framebuffer_cleanup(fb);
>  	kfree(kfb);
> @@ -103,7 +103,7 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file,
>  	return 0;
>  
>  check_failed:
> -	drm_gem_object_put_unlocked(obj);
> +	drm_gem_object_put(obj);
>  	return -EINVAL;
>  }
>  
> @@ -199,7 +199,7 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file,
>  
>  err_cleanup:
>  	for (i = 0; i < kfb->base.format->num_planes; i++)
> -		drm_gem_object_put_unlocked(kfb->base.obj[i]);
> +		drm_gem_object_put(kfb->base.obj[i]);
>  
>  	kfree(kfb);
>  	return ERR_PTR(ret);
> diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
> index def8c9ffafca..c2507b7d8512 100644
> --- a/drivers/gpu/drm/arm/malidp_drv.c
> +++ b/drivers/gpu/drm/arm/malidp_drv.c
> @@ -349,11 +349,11 @@ malidp_verify_afbc_framebuffer_size(struct drm_device *dev,
>  	if (objs->size < afbc_size) {
>  		DRM_DEBUG_KMS("buffer size (%zu) too small for AFBC buffer size = %u\n",
>  			      objs->size, afbc_size);
> -		drm_gem_object_put_unlocked(objs);
> +		drm_gem_object_put(objs);
>  		return false;
>  	}
>  
> -	drm_gem_object_put_unlocked(objs);
> +	drm_gem_object_put(objs);
>  
>  	return true;
>  }
> -- 
> 2.25.1
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯