Commit 01cc2ec6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: cleanup __printf() atributes on printk messages 



There are still some warnings produced by -Wsuggest-attribute=format,
like this one:

	drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c: In function ‘dtrace_dot’:
	drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c:2466:2: warning: function ‘dtrace_dot’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
	 2466 |  ia_css_debug_vdtrace(IA_CSS_DEBUG_INFO, fmt, ap);
	      |  ^~~~~~~~~~~~~~~~~~~~

Also, on some places, is is using __atribute, while on others it
is using the __printf() macro.

Uniform those to always use the __printf() macro, placing it
before the function, and fix the logic in order to cleanup
all such warnings.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 8e3d5d4b

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

+3 −4
Original line number Diff line number Diff line
@@ -159,15 +159,14 @@ static void atomisp_css2_hw_load(hrt_address addr, void *to, uint32_t n) 
	spin_unlock_irqrestore(&mmio_lock, flags);

}



static int  __attribute__((format (printf, 1, 0)))

atomisp_css2_dbg_ftrace_print(const char *fmt, va_list args)

static int  __printf(1, 0) atomisp_css2_dbg_ftrace_print(const char *fmt,

							 va_list args)

{

	ftrace_vprintk(fmt, args);

	return 0;

}



static int  __attribute__((format (printf, 1, 0)))

atomisp_vprintk(const char *fmt, va_list args)

static int  __printf(1, 0) atomisp_vprintk(const char *fmt, va_list args)

{

	vprintk(fmt, args);

	return 0;

drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 


extern int (*sh_css_printf)(const char *fmt, va_list args);

/* depends on host supplied print function in ia_css_init() */

static inline  __attribute__((format (printf, 1, 0)))

void ia_css_print(const char *fmt, ...)

static inline  __printf(1, 2) void ia_css_print(const char *fmt, ...)

{

	va_list ap;

drivers/staging/media/atomisp/pci/ia_css_env.h

+2 −2
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ struct ia_css_hw_access_env { 
/* Environment with function pointers to print error and debug messages.

 */

struct ia_css_print_env {

	int (*debug_print)(const char *fmt, va_list args) __attribute__((format (printf, 1, 0)));

	int  __printf(1, 0) (*debug_print)(const char *fmt, va_list args);

	/** Print a debug message. */

	int (*error_print)(const char *fmt, va_list args) __attribute__((format (printf, 1, 0)));

	int  __printf(1, 0) (*error_print)(const char *fmt, va_list args);

	/** Print an error message.*/

};

drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h

+5 −4
Original line number Diff line number Diff line
@@ -129,15 +129,16 @@ enum ia_css_debug_enable_param_dump { 
 * @param[in]	fmt		printf like format string

 * @param[in]	args		arguments for the format string

 */

static inline void

ia_css_debug_vdtrace(unsigned int level, const char *fmt, va_list args)

static inline void __printf(2, 0) ia_css_debug_vdtrace(unsigned int level,

						       const char *fmt,

						       va_list args)

{

	if (dbg_level >= level)

		sh_css_vprint(fmt, args);

}



__printf(2, 3)

void ia_css_debug_dtrace(unsigned int level, const char *fmt, ...);

__printf(2, 3) void ia_css_debug_dtrace(unsigned int level,

					const char *fmt, ...);



/*! @brief Dump sp thread's stack contents

 * SP thread's stack contents are set to 0xcafecafe. This function dumps the

drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c

+1 −2
Original line number Diff line number Diff line
@@ -2454,8 +2454,7 @@ ia_css_debug_mode_enable_dma_channel(int dma_id, 
	return rc;

}



static

void dtrace_dot(const char *fmt, ...)

static void __printf(1, 2) dtrace_dot(const char *fmt, ...)

{

	va_list ap;

CRA Git | Maintained and supported by SUSTech CRA and CCSE