Re: [PATCH] kernel-doc: handle #if in enums as well

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Johannes Berg <johannes@xxxxxxxxxxxxxxxx> writes:

> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> In addition to #ifdef, #define and #endif, also handle
> any #if since we may be using e.g. #if IS_ENABLED(...).
>
> I didn't find any instances of this in the kernel now,
> there are enums with such ifs inside, but I didn't find
> any with kernel-doc as well. However, it came up as we
> were adding such a construct in our driver and warnings
> from kernel-doc were the result.
>
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
> ---
>  scripts/kernel-doc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/kernel-doc b/scripts/kernel-doc
> index e8aefd258a29..152b42181662 100755
> --- a/scripts/kernel-doc
> +++ b/scripts/kernel-doc
> @@ -1330,7 +1330,7 @@ sub dump_enum($$) {
>  
>      $x =~ s@/\*.*?\*/@@gos;	# strip comments.
>      # strip #define macros inside enums
> -    $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
> +    $x =~ s@#\s*((define|ifdef|if)\s+|endif)[^;]*;@@gos;

Applied, thanks.

jon




[Index of Archives]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux