checkpatch: do not require an empty line before error injection

[PATCH] checkpatch: do not require an empty line before error injection

Posted by Sergey Senozhatsky 2 years, 1 month ago

ALLOW_ERROR_INJECTION macro (just like EXPORT_SYMBOL) can immediately
follow a function it annotates.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 25fdb7fda112..a94ed6c46a6d 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4054,7 +4054,7 @@ sub process {
 		if ($prevline =~ /^[\+ ]};?\s*$/ &&
 		    $line =~ /^\+/ &&
 		    !($line =~ /^\+\s*$/ ||
-		      $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param)/ ||
+		      $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param|ALLOW_ERROR_INJECTION)/ ||
 		      $line =~ /^\+\s*MODULE_/i ||
 		      $line =~ /^\+\s*\#\s*(?:end|elif|else)/ ||
 		      $line =~ /^\+[a-z_]*init/ ||
-- 
2.42.0.869.gea05f2083d-goog

Re: [PATCH] checkpatch: do not require an empty line before error injection

Posted by Joe Perches 2 years ago

On Thu, 2023-11-09 at 16:51 +0900, Sergey Senozhatsky wrote:
> ALLOW_ERROR_INJECTION macro (just like EXPORT_SYMBOL) can immediately
> follow a function it annotates.
> 
> Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>

Acked-by: Joe Perches <joe@perches.com>

> ---
>  scripts/checkpatch.pl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 25fdb7fda112..a94ed6c46a6d 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -4054,7 +4054,7 @@ sub process {
>  		if ($prevline =~ /^[\+ ]};?\s*$/ &&
>  		    $line =~ /^\+/ &&
>  		    !($line =~ /^\+\s*$/ ||
> -		      $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param)/ ||
> +		      $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param|ALLOW_ERROR_INJECTION)/ ||
>  		      $line =~ /^\+\s*MODULE_/i ||
>  		      $line =~ /^\+\s*\#\s*(?:end|elif|else)/ ||
>  		      $line =~ /^\+[a-z_]*init/ ||

Re: [PATCH] checkpatch: do not require an empty line before error injection

Posted by Sergey Senozhatsky 2 years ago

On (23/11/09 16:51), Sergey Senozhatsky wrote:
> 
> ALLOW_ERROR_INJECTION macro (just like EXPORT_SYMBOL) can immediately
> follow a function it annotates.

Gentle ping.

[..]
> @@ -4054,7 +4054,7 @@ sub process {
>  		if ($prevline =~ /^[\+ ]};?\s*$/ &&
>  		    $line =~ /^\+/ &&
>  		    !($line =~ /^\+\s*$/ ||
> -		      $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param)/ ||
> +		      $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param|ALLOW_ERROR_INJECTION)/ ||
>  		      $line =~ /^\+\s*MODULE_/i ||
>  		      $line =~ /^\+\s*\#\s*(?:end|elif|else)/ ||
>  		      $line =~ /^\+[a-z_]*init/ ||
> -- 
> 2.42.0.869.gea05f2083d-goog
>