[PATCH] staging: mt7621-mmc: Use __func__ instead of __FUNCTION__ in dbg.h

Joe Perches joe at perches.com
Thu Aug 16 20:07:41 UTC 2018


On Fri, 2018-08-17 at 01:19 +0530, Nishad Kamdar wrote:
> Use the identifier __func__ instead of gcc specific __FUNCTION__
> in dbg.h. Limit these lines to 80 characters. Issues found by
> checkpatch.

It looks like there are 4 uses in -next

drivers/staging/mt7621-mmc/dbg.h:110:            host->id,  ##args , __FUNCTION__, __LINE__, current->comm, current->pid);      \
drivers/staging/mt7621-mmc/dbg.h:118:          host->id,  ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \
drivers/staging/mt7621-mmc/dbg.h:129:          host->id,  ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \
drivers/staging/mt7621-mmc/dbg.h:136:          host->id,  ##args, __FUNCTION__, __LINE__);      \

If you are going to fix this by substitution,
please fix all of them, even if commented out.

And likely, all these uses should all be converted
to dev_<level> instead without __func__ or __LINE__
or current->comm and current->pid.

And relatedly, these are single statement macros and
don't need do while (0);

And the ; after while (0) is unnecessary.

> Signed-off-by: Nishad Kamdar <nishadkamdar at gmail.com>
> ---
>  drivers/staging/mt7621-mmc/dbg.h | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/mt7621-mmc/dbg.h b/drivers/staging/mt7621-mmc/dbg.h
> index 2f2c56b73987..5da275239d7c 100644
> --- a/drivers/staging/mt7621-mmc/dbg.h
> +++ b/drivers/staging/mt7621-mmc/dbg.h
> @@ -115,7 +115,8 @@ do {    \
>  #define ERR_MSG(fmt, args...) \
>  do { \
>  	printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \
> -	       host->id,  ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \
> +	       host->id,  ##args, __func__, __LINE__, current->comm, \
> +	       current->pid); \
>  } while (0);
>  
>  #if 1
> @@ -126,14 +127,15 @@ do { \
>  #define INIT_MSG(fmt, args...) \
>  do { \
>  	printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \
> -	       host->id,  ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \
> +	       host->id,  ##args, __func__, __LINE__, current->comm, \
> +	       current->pid); \
>  } while (0);
>  
>  /* PID in ISR in not corrent */
>  #define IRQ_MSG(fmt, args...) \
>  do { \
>  	printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d>\n",	\
> -	       host->id,  ##args, __FUNCTION__, __LINE__);	\
> +	       host->id,  ##args, __func__, __LINE__);	\
>  } while (0);
>  #endif
>  


More information about the devel mailing list