pwm: Add missing "CONFIG_" prefix
PATCH 1/1 pwm: Add missing "CONFIG_" prefix
The IS_ENABLED() use was missing the CONFIG_ prefix which would have lead to skipping this code.
--- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/core.c +1 -1
@@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) pwm->chip->ops->get_state (pwm->chip, pwm, &pwm->state);trace_pwm_get (pwm, &pwm->state); -if (IS_ENABLED (PWM_DEBUG )) +if (IS_ENABLED (CONFIG_PWM_DEBUG )) pwm->last = pwm->state; }
Signature · 5 lines
2.25.1 -- Kees Cook
Quoted 25 lines · Kees Cook
The
IS_ENABLED()use was missing theCONFIG_prefix which would have lead to skipping this code.Fixes 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers")Signed-off-by Kees Cook <[email protected]>--- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pwm/core.c +1
-1@@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) pwm->chip->ops->get_state (pwm->chip, pwm, &pwm->state);trace_pwm_get (pwm, &pwm->state); -if (IS_ENABLED (PWM_DEBUG )) +if (IS_ENABLED (CONFIG_PWM_DEBUG )) pwm->last = pwm->state; }Signature · 1 line
2.25.1
more odd uses (mostly in comments)
$ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \
sed -r 's/\s+//g'| \
grep -v '(CONFIG_' | \
sort | uniq -c | sort -rn
7 IS_ENABLED(DEBUG)
4 IS_ENABLED(DRM_I915_SELFTEST)
4 IS_ENABLED(cfg)
2 IS_ENABLED(opt_name)
2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ)
2 IS_ENABLED(config)
2 IS_ENABLED(cond)
2 IS_ENABLED(__BIG_ENDIAN)
1 IS_ENABLED(x)
1 IS_ENABLED(STRICT_KERNEL_RWX)
1 IS_ENABLED(PWM_DEBUG)
1 IS_ENABLED(option)
1 IS_ENABLED(ETHTOOL_NETLINK)
1 IS_ENABLED(DEBUG_RANDOM_TRIE)
1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST)STRICT_KERNEL_RWX is misused here in ppc
---
Fix pr_warn without newline too.
arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/powerpc/mm/book3s64/hash_utils.c +2 -3
@@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void)* Pick a size for the linear mapping. Currently, we only * support 16M, 1M and 4K which is the default */ -if (IS_ENABLED (STRICT_KERNEL_RWX ) && +if (IS_ENABLED (CONFIG_STRICT_KERNEL_RWX ) && (unsigned long )_stext %0x1000000 ) {if (mmu_psize_defs[MMU_PAGE_16M ].shift) -pr_warn ("Kernel not 16M aligned, " -"disabling 16M linear map alignment" ); +pr_warn ("Kernel not 16M aligned, disabling 16M linear map alignment\n" ); aligned = false; }
Kees Cook
Reviewed-byQuoted 6 lines · Joe Perches
more odd uses (mostly in comments)
$ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \ sed -r 's/\s+//g'| \ grep -v '(CONFIG_' | \ sort | uniq -c | sort -rn
I think a missed a bunch because my grep was messy. :) This is much easier to scan.
Quoted 4 lines
7 IS_ENABLED(DEBUG)
4 IS_ENABLED(cfg)
2 IS_ENABLED(opt_name)
2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ)Quoted 8 lines
2 IS_ENABLED(config)
2 IS_ENABLED(cond)
2 IS_ENABLED(__BIG_ENDIAN)
1 IS_ENABLED(x)
1 IS_ENABLED(PWM_DEBUG)
1 IS_ENABLED(option)
1 IS_ENABLED(DEBUG_RANDOM_TRIE)
1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST)These seem to be "as expected".
Quoted 3 lines
4 IS_ENABLED(DRM_I915_SELFTEST)
1 IS_ENABLED(STRICT_KERNEL_RWX)
1 IS_ENABLED(ETHTOOL_NETLINK)But these are not.
Quoted 17 lines
STRICT_KERNEL_RWXis misused here in ppc---
Fix
pr_warnwithout newline too.arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)arch/powerpc/mm/book3s64/hash_utils.c +0
-0@@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void)* Pick a size for the linear mapping. Currently, we only * support 16M, 1M and 4K which is the default
arch/powerpc/mm/book3s64/hash_utils.c static void __init htab_init_page_sizes(void) · line 668
Quoted 10 lines
arch/powerpc/mm/book3s64/hash_utils.c +2
-3*/ -if (IS_ENABLED (STRICT_KERNEL_RWX ) && +if (IS_ENABLED (CONFIG_STRICT_KERNEL_RWX ) && (unsigned long )_stext %0x1000000 ) {if (mmu_psize_defs[MMU_PAGE_16M ].shift) -pr_warn ("Kernel not 16M aligned, " -"disabling 16M linear map alignment" ); +pr_warn ("Kernel not 16M aligned, disabling 16M linear map alignment\n" ); aligned = false; }
Signature · 1 line
Kees Cook
Quoted 65 lines · Joe Perches
Quoted 25 lines · Kees Cook
The
IS_ENABLED()use was missing theCONFIG_prefix which would have lead to skipping this code.Fixes 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers")Signed-off-by Kees Cook <[email protected]>--- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pwm/core.c +1
-1@@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) pwm->chip->ops->get_state (pwm->chip, pwm, &pwm->state);trace_pwm_get (pwm, &pwm->state); -if (IS_ENABLED (PWM_DEBUG )) +if (IS_ENABLED (CONFIG_PWM_DEBUG )) pwm->last = pwm->state; }Signature · 1 line
2.25.1more odd uses (mostly in comments)
$ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \ sed -r 's/\s+//g'| \ grep -v '(CONFIG_' | \ sort | uniq -c | sort -rn 7 IS_ENABLED(DEBUG) 4 IS_ENABLED(DRM_I915_SELFTEST) 4 IS_ENABLED(cfg) 2 IS_ENABLED(opt_name) 2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ) 2 IS_ENABLED(config) 2 IS_ENABLED(cond) 2 IS_ENABLED(__BIG_ENDIAN) 1 IS_ENABLED(x) 1 IS_ENABLED(STRICT_KERNEL_RWX) 1 IS_ENABLED(PWM_DEBUG) 1 IS_ENABLED(option) 1 IS_ENABLED(ETHTOOL_NETLINK) 1 IS_ENABLED(DEBUG_RANDOM_TRIE) 1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST)
STRICT_KERNEL_RWXis misused here in ppc---
Fix
pr_warnwithout newline too.arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)arch/powerpc/mm/book3s64/hash_utils.c +0
-0@@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void)* Pick a size for the linear mapping. Currently, we only * support 16M, 1M and 4K which is the default
arch/powerpc/mm/book3s64/hash_utils.c static void __init htab_init_page_sizes(void) · line 668
Quoted 10 lines
arch/powerpc/mm/book3s64/hash_utils.c +2
-3*/ -if (IS_ENABLED (STRICT_KERNEL_RWX ) && +if (IS_ENABLED (CONFIG_STRICT_KERNEL_RWX ) && (unsigned long )_stext %0x1000000 ) {if (mmu_psize_defs[MMU_PAGE_16M ].shift) -pr_warn ("Kernel not 16M aligned, " -"disabling 16M linear map alignment" ); +pr_warn ("Kernel not 16M aligned, disabling 16M linear map alignment\n" ); aligned = false; }
Joe, I was going to send all of the fixes for these issues, but your patch doesn't have a SoB. Shall I add one for the above patch?
Signature · 1 line
Kees Cook
Quoted 71 lines · Kees Cook
Quoted 70 lines · Joe Perches
Quoted 25 lines · Kees Cook
The
IS_ENABLED()use was missing theCONFIG_prefix which would have lead to skipping this code.Fixes 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers")Signed-off-by Kees Cook <[email protected]>--- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pwm/core.c +1
-1@@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) pwm->chip->ops->get_state (pwm->chip, pwm, &pwm->state);trace_pwm_get (pwm, &pwm->state); -if (IS_ENABLED (PWM_DEBUG )) +if (IS_ENABLED (CONFIG_PWM_DEBUG )) pwm->last = pwm->state; }Signature · 1 line
2.25.1more odd uses (mostly in comments)
$ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \ sed -r 's/\s+//g'| \ grep -v '(CONFIG_' | \ sort | uniq -c | sort -rn 7 IS_ENABLED(DEBUG) 4 IS_ENABLED(DRM_I915_SELFTEST) 4 IS_ENABLED(cfg) 2 IS_ENABLED(opt_name) 2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ) 2 IS_ENABLED(config) 2 IS_ENABLED(cond) 2 IS_ENABLED(__BIG_ENDIAN) 1 IS_ENABLED(x) 1 IS_ENABLED(STRICT_KERNEL_RWX) 1 IS_ENABLED(PWM_DEBUG) 1 IS_ENABLED(option) 1 IS_ENABLED(ETHTOOL_NETLINK) 1 IS_ENABLED(DEBUG_RANDOM_TRIE) 1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST)
STRICT_KERNEL_RWXis misused here in ppc---
Fix
pr_warnwithout newline too.arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)arch/powerpc/mm/book3s64/hash_utils.c +1
-1@@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void)* Pick a size for the linear mapping. Currently, we only * support 16M, 1M and 4K which is the default */ -if (IS_ENABLED (STRICT_KERNEL_RWX ) && +if (IS_ENABLED (CONFIG_STRICT_KERNEL_RWX ) && (unsigned long )_stext %0x1000000 ) {if (mmu_psize_defs[MMU_PAGE_16M ].shift)
Quoted 8 lines
arch/powerpc/mm/book3s64/hash_utils.c static void __init htab_init_page_sizes(void) · line 668
Quoted 5 lines
arch/powerpc/mm/book3s64/hash_utils.c +1
-2-pr_warn ("Kernel not 16M aligned, " -"disabling 16M linear map alignment" ); +pr_warn ("Kernel not 16M aligned, disabling 16M linear map alignment\n" ); aligned = false; }Joe, I was going to send all of the fixes for these issues, but your patch doesn't have a SoB. Shall I add one for the above patch?
<shrug> sure if you want, or submit it yourself.
My feeling about these types of changes is the maintainers of the subsystems, in this case ppc, should manage this themselves and shouldn't require anyone else to actually bother to send real patches.
Quoted 14 lines · Kees Cook
The
IS_ENABLED()use was missing theCONFIG_prefix which would have lead to skipping this code.Fixes 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers")Signed-off-by Kees Cook <[email protected]>--- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pwm/core.c +0
-0
drivers/pwm/core.c static int pwm_device_request(struct pwm_device *pwm, const char *label) · line 125
Quoted 6 lines
drivers/pwm/core.c +1
-1@@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) pwm->chip->ops->get_state (pwm->chip, pwm, &pwm->state);trace_pwm_get (pwm, &pwm->state); -if (IS_ENABLED (PWM_DEBUG )) +if (IS_ENABLED (CONFIG_PWM_DEBUG )) pwm->last = pwm->state;
Thanks
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Thierry Reding
AppliedQuoted 8 lines · Kees Cook
The
IS_ENABLED()use was missing theCONFIG_prefix which would have lead to skipping this code.Fixes 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers")Signed-off-by Kees Cook <[email protected]>--- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Thierry