diff --git a/.github/workflows/shallow_checkpatch.yml b/.github/workflows/shallow_checkpatch.yml
index 4b677eeda690..6a0b2e4af2b3 100644
--- a/.github/workflows/shallow_checkpatch.yml
+++ b/.github/workflows/shallow_checkpatch.yml
@@ -19,8 +19,11 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       PR_NUM: ${{github.event.number}}
+      # TODO: reduce duplication with scripts/sof-*-commit-hook.sh
+      # thanks to either some .conf file or some wrapper script
       CHK_CMD_OPTS: --ignore UNKNOWN_COMMIT_ID --codespell --codespellfile
           /usr/lib/python3/dist-packages/codespell_lib/data/dictionary.txt
+         --ignore C99_COMMENT_TOLERANCE
     steps:
       # depth 2 so:
       # ^1. we can show the Subject of the current target branch tip
diff --git a/scripts/sof-post-commit-hook.sh b/scripts/sof-post-commit-hook.sh
index e20fce11d5e0..b72aae70cc07 100755
--- a/scripts/sof-post-commit-hook.sh
+++ b/scripts/sof-post-commit-hook.sh
@@ -3,4 +3,8 @@
 # Copyright(c) 2018 Intel Corporation. All rights reserved.
 
 set -e
-exec git show --format=email HEAD | ./scripts/checkpatch.pl --no-tree --strict --codespell
+# TODO: reduce duplication with scripts/sof-pre-commit-hook.sh
+# and with .github/workflows/ with either some .conf file
+# or some wrapper script
+exec git show --format=email HEAD |
+  ./scripts/checkpatch.pl --no-tree --strict --codespell --ignore C99_COMMENT_TOLERANCE