* [PATCH] lib/zlib_inflate/inffast: Check config in C to avoid unused function warning
@ 2021-09-16 14:22 Paul Menzel
2021-09-16 14:58 ` Nathan Chancellor
2021-09-17 5:17 ` Christophe Leroy
0 siblings, 2 replies; 3+ messages in thread
From: Paul Menzel @ 2021-09-16 14:22 UTC (permalink / raw)
To: Nathan Chancellor, Nick Desaulniers
Cc: Zhen Lei, Andrew Morton, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev,
Paul Menzel, linux-kernel, llvm
Building Linux for ppc64le with Ubuntu clang version 12.0.0-3ubuntu1~21.04.1
shows the warning below.
arch/powerpc/boot/inffast.c:20:1: warning: unused function 'get_unaligned16' [-Wunused-function]
get_unaligned16(const unsigned short *p)
^
1 warning generated.
Fix it, by moving the check from the preprocessor to C, so the compiler
sees the use.
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
lib/zlib_inflate/inffast.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/zlib_inflate/inffast.c b/lib/zlib_inflate/inffast.c
index f19c4fbe1be7..444ad3c3ccd3 100644
--- a/lib/zlib_inflate/inffast.c
+++ b/lib/zlib_inflate/inffast.c
@@ -254,11 +254,7 @@ void inflate_fast(z_streamp strm, unsigned start)
sfrom = (unsigned short *)(from);
loops = len >> 1;
do
-#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
- *sout++ = *sfrom++;
-#else
- *sout++ = get_unaligned16(sfrom++);
-#endif
+ *sout++ = CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS ? *sfrom++ : get_unaligned16(sfrom++);
while (--loops);
out = (unsigned char *)sout;
from = (unsigned char *)sfrom;
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] lib/zlib_inflate/inffast: Check config in C to avoid unused function warning
2021-09-16 14:22 [PATCH] lib/zlib_inflate/inffast: Check config in C to avoid unused function warning Paul Menzel
@ 2021-09-16 14:58 ` Nathan Chancellor
2021-09-17 5:17 ` Christophe Leroy
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2021-09-16 14:58 UTC (permalink / raw)
To: Paul Menzel, Nick Desaulniers
Cc: Zhen Lei, Andrew Morton, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev,
linux-kernel, llvm
Hi Paul,
On 9/16/2021 7:22 AM, Paul Menzel wrote:
> Building Linux for ppc64le with Ubuntu clang version 12.0.0-3ubuntu1~21.04.1
> shows the warning below.
>
> arch/powerpc/boot/inffast.c:20:1: warning: unused function 'get_unaligned16' [-Wunused-function]
> get_unaligned16(const unsigned short *p)
> ^
> 1 warning generated.
>
> Fix it, by moving the check from the preprocessor to C, so the compiler
> sees the use.
>
> Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
> ---
> lib/zlib_inflate/inffast.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/lib/zlib_inflate/inffast.c b/lib/zlib_inflate/inffast.c
> index f19c4fbe1be7..444ad3c3ccd3 100644
> --- a/lib/zlib_inflate/inffast.c
> +++ b/lib/zlib_inflate/inffast.c
> @@ -254,11 +254,7 @@ void inflate_fast(z_streamp strm, unsigned start)
> sfrom = (unsigned short *)(from);
> loops = len >> 1;
> do
> -#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
> - *sout++ = *sfrom++;
> -#else
> - *sout++ = get_unaligned16(sfrom++);
> -#endif
> + *sout++ = CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS ? *sfrom++ : get_unaligned16(sfrom++);
> while (--loops);
> out = (unsigned char *)sout;
> from = (unsigned char *)sfrom;
>
Thanks for the patch. This should probably be
IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ? ...
which matches the rest of the kernel tree, as certain CONFIG_... values
are not guaranteed to always be defined.
Cheers,
Nathan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] lib/zlib_inflate/inffast: Check config in C to avoid unused function warning
2021-09-16 14:22 [PATCH] lib/zlib_inflate/inffast: Check config in C to avoid unused function warning Paul Menzel
2021-09-16 14:58 ` Nathan Chancellor
@ 2021-09-17 5:17 ` Christophe Leroy
1 sibling, 0 replies; 3+ messages in thread
From: Christophe Leroy @ 2021-09-17 5:17 UTC (permalink / raw)
To: Paul Menzel, Nathan Chancellor, Nick Desaulniers
Cc: llvm, Zhen Lei, linux-kernel, Paul Mackerras, Andrew Morton,
linuxppc-dev
Le 16/09/2021 à 16:22, Paul Menzel a écrit :
> Building Linux for ppc64le with Ubuntu clang version 12.0.0-3ubuntu1~21.04.1
> shows the warning below.
>
> arch/powerpc/boot/inffast.c:20:1: warning: unused function 'get_unaligned16' [-Wunused-function]
> get_unaligned16(const unsigned short *p)
> ^
> 1 warning generated.
>
> Fix it, by moving the check from the preprocessor to C, so the compiler
> sees the use.
>
> Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
> ---
> lib/zlib_inflate/inffast.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/lib/zlib_inflate/inffast.c b/lib/zlib_inflate/inffast.c
> index f19c4fbe1be7..444ad3c3ccd3 100644
> --- a/lib/zlib_inflate/inffast.c
> +++ b/lib/zlib_inflate/inffast.c
> @@ -254,11 +254,7 @@ void inflate_fast(z_streamp strm, unsigned start)
> sfrom = (unsigned short *)(from);
> loops = len >> 1;
> do
> -#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
> - *sout++ = *sfrom++;
> -#else
> - *sout++ = get_unaligned16(sfrom++);
> -#endif
> + *sout++ = CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS ? *sfrom++ : get_unaligned16(sfrom++);
You can't do that, CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not
something that have value 0 or 1, it is something which is either
defined or not. You have to use IS_ENABLED() macro, so it should become
something like:
if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS))
*sout++ = *sfrom++;
else
*sout++ = get_unaligned16(sfrom++);
> while (--loops);
> out = (unsigned char *)sout;
> from = (unsigned char *)sfrom;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-17 5:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 14:22 [PATCH] lib/zlib_inflate/inffast: Check config in C to avoid unused function warning Paul Menzel
2021-09-16 14:58 ` Nathan Chancellor
2021-09-17 5:17 ` Christophe Leroy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).