summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>2015-06-25 15:03:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-25 17:00:42 -0700
commit10895d2c82cce9650f7d34c81c1bd29958e15293 (patch)
tree2d5af9f5c96b954487c34bd389c834d86c44ec12 /scripts
parent8617cd09bc874dd7204b83aa3ed5fdc38b79562f (diff)
downloadlinux-stable-10895d2c82cce9650f7d34c81c1bd29958e15293.tar.gz
linux-stable-10895d2c82cce9650f7d34c81c1bd29958e15293.tar.bz2
linux-stable-10895d2c82cce9650f7d34c81c1bd29958e15293.zip
checkpatch: add multi-line handling for PREFER_ETHER_ADDR_COPY
Handle multi-line memcpy() properly. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Acked-by: Joe Perches <joe@perches.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a81fc66e62cc..dfeb553de798 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5149,9 +5149,10 @@ sub process {
# Check for memcpy(foo, bar, ETH_ALEN) that could be ether_addr_copy(foo, bar)
if ($^V && $^V ge 5.10.0 &&
- $line =~ /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/s) {
+ defined $stat &&
+ $stat =~ /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
if (WARN("PREFER_ETHER_ADDR_COPY",
- "Prefer ether_addr_copy() over memcpy() if the Ethernet addresses are __aligned(2)\n" . $herecurr) &&
+ "Prefer ether_addr_copy() over memcpy() if the Ethernet addresses are __aligned(2)\n" . "$here\n$stat\n") &&
$fix) {
$fixed[$fixlinenr] =~ s/\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/ether_addr_copy($2, $7)/;
}