[PATCH] drm: change drm_err return type to void

Jani Nikula jani.nikula at linux.intel.com
Tue Sep 23 06:00:44 PDT 2014


On Mon, 22 Sep 2014, Joe Perches <joe at perches.com> wrote:
> The return value is not used by callers of this function
> nor by uses of the DRM_ERROR macro so change the function
> to return void.
>
> Signed-off-by: Joe Perches <joe at perches.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> ---
> This change is associated to a desire to eventually
> change printk to return void.
>
> No x86 change in output size for drm_drv.o
>
>  drivers/gpu/drm/drm_drv.c | 7 ++-----
>  include/drm/drmP.h        | 2 +-
>  2 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 6a11902..8889f8e 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -56,22 +56,19 @@ static struct idr drm_minors_idr;
>  struct class *drm_class;
>  static struct dentry *drm_debugfs_root;
>  
> -int drm_err(const char *func, const char *format, ...)
> +void drm_err(const char *func, const char *format, ...)
>  {
>  	struct va_format vaf;
>  	va_list args;
> -	int r;
>  
>  	va_start(args, format);
>  
>  	vaf.fmt = format;
>  	vaf.va = &args;
>  
> -	r = printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* %pV", func, &vaf);
> +	printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* %pV", func, &vaf);
>  
>  	va_end(args);
> -
> -	return r;
>  }
>  EXPORT_SYMBOL(drm_err);
>  
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 5c60d38..2163ccb 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -124,7 +124,7 @@ extern __printf(2, 3)
>  void drm_ut_debug_printk(const char *function_name,
>  			 const char *format, ...);
>  extern __printf(2, 3)
> -int drm_err(const char *func, const char *format, ...);
> +void drm_err(const char *func, const char *format, ...);
>  
>  /***********************************************************************/
>  /** \name DRM template customization defaults */
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Jani Nikula, Intel Open Source Technology Center


More information about the dri-devel mailing list