[PATCH 1/2] drm: Fix duplicate const warning in drm_gem_ttm_helper.c

Thomas Zimmermann tzimmermann at suse.de
Mon Sep 23 06:57:51 UTC 2019


Hi

Am 20.09.19 um 21:35 schrieb Sean Paul:
> From: Sean Paul <seanpaul at chromium.org>
> 
> For the warning
> ../drivers/gpu/drm/drm_gem_ttm_helper.c:26:20: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier]
> 
> Reading between the lines, I think the double const is to preserve both
> the values and the pointers in the array (which makes total sense). This

Yes it is. Thanks for fixing.

Reviewed-By: Thomas Zimmermann <tzimmermann at suse.de>

> patch moves the second const to achieve this (and fix the warning).
> 
> Fixes: ff540b76f14a ("drm/ttm: add drm gem ttm helpers, starting with drm_gem_ttm_print_info()")
> Cc: Gerd Hoffmann <kraxel at redhat.com>
> Cc: Thomas Zimmermann <tzimmermann at suse.de>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Maxime Ripard <maxime.ripard at bootlin.com>
> Cc: Sean Paul <sean at poorly.run>
> Cc: dri-devel at lists.freedesktop.org
> Signed-off-by: Sean Paul <seanpaul at chromium.org>
> ---
>  drivers/gpu/drm/drm_gem_ttm_helper.c | 2 +-
>  drivers/gpu/drm/drm_print.c          | 2 +-
>  include/drm/drm_print.h              | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_ttm_helper.c b/drivers/gpu/drm/drm_gem_ttm_helper.c
> index 9a4bafcf20df..ae7ba0052959 100644
> --- a/drivers/gpu/drm/drm_gem_ttm_helper.c
> +++ b/drivers/gpu/drm/drm_gem_ttm_helper.c
> @@ -23,7 +23,7 @@
>  void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent,
>  			    const struct drm_gem_object *gem)
>  {
> -	static const char const *plname[] = {
> +	static const char * const plname[] = {
>  		[ TTM_PL_SYSTEM ] = "system",
>  		[ TTM_PL_TT     ] = "tt",
>  		[ TTM_PL_VRAM   ] = "vram",
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index dfa27367ebb8..20c49c85b7a2 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -198,7 +198,7 @@ EXPORT_SYMBOL(drm_printf);
>   * @to: end of bit range to print (exclusive).
>   */
>  void drm_print_bits(struct drm_printer *p,
> -		    unsigned long value, const char *bits[],
> +		    unsigned long value, const char * const bits[],
>  		    unsigned int from, unsigned int to)
>  {
>  	bool first = true;
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 12d4916254b4..1e6a4ee8a6b2 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -90,7 +90,7 @@ void drm_printf(struct drm_printer *p, const char *f, ...);
>  void drm_puts(struct drm_printer *p, const char *str);
>  void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset);
>  void drm_print_bits(struct drm_printer *p,
> -		    unsigned long value, const char *bits[],
> +		    unsigned long value, const char * const bits[],
>  		    unsigned int from, unsigned int to);
>  
>  __printf(2, 0)
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20190923/b9aa250d/attachment-0001.sig>


More information about the dri-devel mailing list