Skip to content

Commit 1123cfe

Browse files
committed
Merge tag 'coccinelle-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux
Pull Coccinelle fixes from Julia Lawall: "These fix a typo and make the coccicheck script more robust by ensuring that only compatible semantic patches are executed for the chosen mode" * tag 'coccinelle-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux: Coccinelle: pm_runtime: Fix typo in report message scripts: coccicheck: filter *.cocci files by MODE
2 parents 10a0e84 + 52ad85f commit 1123cfe

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

scripts/coccicheck

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,11 @@ fi
270270

271271
if [ "$COCCI" = "" ] ; then
272272
for f in `find $srctree/scripts/coccinelle/ -name '*.cocci' -type f | sort`; do
273-
coccinelle $f
273+
if grep -q "virtual[[:space:]]\+$MODE" "$f"; then
274+
coccinelle $f
275+
else
276+
echo "warning: Skipping $f as it does not match mode '$MODE'"
277+
fi
274278
done
275279
else
276280
coccinelle $COCCI

scripts/coccinelle/api/pm_runtime.cocci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ p2 << r.p2;
109109
pm_runtime_api << r.pm_runtime_api;
110110
@@
111111
112-
msg = "%s returns < 0 as error. Unecessary IS_ERR_VALUE at line %s" % (pm_runtime_api, p2[0].line)
112+
msg = "%s returns < 0 as error. Unnecessary IS_ERR_VALUE at line %s" % (pm_runtime_api, p2[0].line)
113113
coccilib.report.print_report(p1[0],msg)

0 commit comments

Comments
 (0)