2016-12-20 19:11:19

by Paul Bolle

Subject: [PATCH] checkpatch: stop worrying about include/asm/

include/asm/ got removed in v1.1.45. Two decades later it's about time
to stop worrying whether patches still touch it.

Signed-off-by: Paul Bolle <[email protected]>
---
Lightly tested.

scripts/checkpatch.pl | 5 -----
1 file changed, 5 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a8368d1c4348..4975f251ba80 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2333,11 +2333,6 @@ sub process {
WARN("PATCH_PREFIX",
"patch prefix '$p1_prefix' exists, appears to be a -p0 patch\n");
}
-
- if ($realfile =~ m@^include/asm/@) {
- ERROR("MODIFIED_INCLUDE_ASM",
- "do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
- }
$found_file = 1;
}

--
2.7.4

2016-12-20 19:59:23

by Joe Perches

Subject: Re: [PATCH] checkpatch: stop worrying about include/asm/

On Tue, 2016-12-20 at 20:09 +0100, Paul Bolle wrote:
> include/asm/ got removed in v1.1.45. Two decades later it's about time
> to stop worrying whether patches still touch it.
>
> Signed-off-by: Paul Bolle <[email protected]>
> ---
> Lightly tested.
>
> scripts/checkpatch.pl | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index a8368d1c4348..4975f251ba80 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -2333,11 +2333,6 @@ sub process {
> WARN("PATCH_PREFIX",
> "patch prefix '$p1_prefix' exists, appears to be a -p0 patch\n");
> }
> -
> - if ($realfile =~ m@^include/asm/@) {
> - ERROR("MODIFIED_INCLUDE_ASM",
> - "do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
> - }
> $found_file = 1;
> }

I wonder what Andy really intended with commit

It seems wrong.

commit c1ab33269a84d6056d2ffc728d8bbaa26377d3e3
Author: Andy Whitcroft <[email protected]>
Date: Wed Oct 15 22:02:20 2008 -0700

checkpatch: include/asm checks should be anchored

It is possible to have other include/asm paths within the tree which are
not subject to the do not edit checks. Ignore those.

Signed-off-by: Andy Whitcroft <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
---
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 482768cd5790..0e5af8ed107e 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1134,7 +1134,7 @@ sub process {
$realfile = $1;
$realfile =~ s@^[^/]*/@@;

- if ($realfile =~ m@include/asm/@) {
+ if ($realfile =~ m@^include/asm/@) {
ERROR("do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
}