Commit 1123cfe8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 10a0e846 52ad85fd

scripts/coccicheck

+5 −1
Original line number Diff line number Diff line
@@ -270,7 +270,11 @@ fi 


if [ "$COCCI" = "" ] ; then

    for f in `find $srctree/scripts/coccinelle/ -name '*.cocci' -type f | sort`; do

        if grep -q "virtual[[:space:]]\+$MODE" "$f"; then

                coccinelle $f

        else

                echo "warning: Skipping $f as it does not match mode '$MODE'"

        fi

    done

else

    coccinelle $COCCI

scripts/coccinelle/api/pm_runtime.cocci

+1 −1
Original line number Diff line number Diff line
@@ -109,5 +109,5 @@ p2 << r.p2; 
pm_runtime_api << r.pm_runtime_api;

@@



msg = "%s returns < 0 as error. Unecessary IS_ERR_VALUE at line %s" % (pm_runtime_api, p2[0].line)

msg = "%s returns < 0 as error. Unnecessary IS_ERR_VALUE at line %s" % (pm_runtime_api, p2[0].line)

coccilib.report.print_report(p1[0],msg)