From: Mathieu Malaterre <malat@debian.org>
To: LEROY Christophe <christophe.leroy@c-s.fr>
Cc: LKML <linux-kernel@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Paul Mackerras <paulus@samba.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Michael Ellerman <mpe@ellerman.id.au>
Subject: Re: [PATCH v4 03/19] powerpc: Mark variable `l` as unused, remove `path`
Date: Fri, 6 Apr 2018 20:32:08 +0200 [thread overview]
Message-ID: <CA+7wUswhZHNabB6kAcX8Cu8zMai15RzGn9euwdKau8kY48i-CA@mail.gmail.com> (raw)
In-Reply-To: <20180406173335.Horde.Qgml03BtHOxSl6SzIPgQLA9@messagerie.si.c-s.fr>
On Fri, Apr 6, 2018 at 5:33 PM, LEROY Christophe
<christophe.leroy@c-s.fr> wrote:
> Mathieu Malaterre <malat@debian.org> a écrit :
>
>> Add gcc attribute unused for `l` variable, replace `path` variable
>> directly
>> with prom_scratch. Fix warnings treated as errors with W=1:
>>
>> arch/powerpc/kernel/prom_init.c:607:6: error: variable ‘l’ set but not
>> used [-Werror=unused-but-set-variable]
>> arch/powerpc/kernel/prom_init.c:1388:8: error: variable ‘path’ set but
>> not used [-Werror=unused-but-set-variable]
>>
>> Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
>> Signed-off-by: Mathieu Malaterre <malat@debian.org>
>> ---
>> v4: redo v3 since path variable can be avoided
>> v3: really move path within ifdef DEBUG_PROM
>> v2: move path within ifdef DEBUG_PROM
>>
>> arch/powerpc/kernel/prom_init.c | 11 +++++------
>> 1 file changed, 5 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/powerpc/kernel/prom_init.c
>> b/arch/powerpc/kernel/prom_init.c
>> index f8a9a50ff9b5..4b223a9470be 100644
>> --- a/arch/powerpc/kernel/prom_init.c
>> +++ b/arch/powerpc/kernel/prom_init.c
>> @@ -604,7 +604,7 @@ static void __init early_cmdline_parse(void)
>> const char *opt;
>>
>> char *p;
>> - int l = 0;
>> + int l __maybe_unused = 0;
>
>
> Instead of hiding the problem with __maybe_unused, I think we could replace
> the
> #ifdef CONFIG_CMDLINE
> by a
> if (IS_ENABLED(CONFIG_CMDLINE_BOOL))
>
> This is recommanded by Linux codying style
Neat. I was not aware of this trick. Does not work in this case though:
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 7925f64fefde..19634739b279 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -604,17 +604,16 @@ static void __init early_cmdline_parse(void)
const char *opt;
char *p;
- int l __maybe_unused = 0;
+ int l = 0;
prom_cmd_line[0] = 0;
p = prom_cmd_line;
if ((long)prom.chosen > 0)
l = prom_getprop(prom.chosen, "bootargs", p,
COMMAND_LINE_SIZE-1);
-#ifdef CONFIG_CMDLINE
- if (l <= 0 || p[0] == '\0') /* dbl check */
- strlcpy(prom_cmd_line,
- CONFIG_CMDLINE, sizeof(prom_cmd_line));
-#endif /* CONFIG_CMDLINE */
+ if (IS_ENABLED(CONFIG_CMDLINE_BOOL))
+ if (l <= 0 || p[0] == '\0') /* dbl check */
+ strlcpy(prom_cmd_line,
+ CONFIG_CMDLINE, sizeof(prom_cmd_line));
prom_printf("command line: %s\n", prom_cmd_line);
#ifdef CONFIG_PPC64
leads to:
CC arch/powerpc/kernel/prom_init.o
../arch/powerpc/kernel/prom_init.c: In function ‘early_cmdline_parse’:
../arch/powerpc/kernel/prom_init.c:616:5: error: ‘CONFIG_CMDLINE’
undeclared (first use in this function)
CONFIG_CMDLINE, sizeof(prom_cmd_line));
^~~~~~~~~~~~~~
../arch/powerpc/kernel/prom_init.c:616:5: note: each undeclared
identifier is reported only once for each function it appears in
../scripts/Makefile.build:312: recipe for target
'arch/powerpc/kernel/prom_init.o' failed
make[6]: *** [arch/powerpc/kernel/prom_init.o] Error 1
> Christophe
>
>
>>
>> prom_cmd_line[0] = 0;
>> p = prom_cmd_line;
>> @@ -1386,7 +1386,7 @@ static void __init reserve_mem(u64 base, u64 size)
>> static void __init prom_init_mem(void)
>> {
>> phandle node;
>> - char *path, type[64];
>> + char type[64];
>> unsigned int plen;
>> cell_t *p, *endp;
>> __be32 val;
>> @@ -1407,7 +1407,6 @@ static void __init prom_init_mem(void)
>> prom_debug("root_size_cells: %x\n", rsc);
>>
>> prom_debug("scanning memory:\n");
>> - path = prom_scratch;
>>
>> for (node = 0; prom_next_node(&node); ) {
>> type[0] = 0;
>> @@ -1432,9 +1431,9 @@ static void __init prom_init_mem(void)
>> endp = p + (plen / sizeof(cell_t));
>>
>> #ifdef DEBUG_PROM
>> - memset(path, 0, PROM_SCRATCH_SIZE);
>> - call_prom("package-to-path", 3, 1, node, path,
>> PROM_SCRATCH_SIZE-1);
>> - prom_debug(" node %s :\n", path);
>> + memset(prom_scratch, 0, PROM_SCRATCH_SIZE);
>> + call_prom("package-to-path", 3, 1, node, prom_scratch,
>> PROM_SCRATCH_SIZE - 1);
>> + prom_debug(" node %s :\n", prom_scratch);
>> #endif /* DEBUG_PROM */
>>
>> while ((endp - p) >= (rac + rsc)) {
>> --
>> 2.11.0
>
>
>
next prev parent reply other threads:[~2018-04-06 18:32 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 20:19 [PATCH 00/19] powerpc/ppc32: make W=1 compilation errors free Mathieu Malaterre
2018-03-22 20:19 ` [PATCH 01/19] powerpc/powermac: Mark variable x as unused Mathieu Malaterre
2018-03-23 9:18 ` christophe leroy
2018-03-28 19:27 ` [PATCH v2 " Mathieu Malaterre
2018-03-29 16:07 ` LEROY Christophe
2018-04-04 20:21 ` Mathieu Malaterre
2018-04-04 20:07 ` [PATCH v3 " Mathieu Malaterre
2018-04-24 14:12 ` Christophe LEROY
2018-05-25 11:41 ` [v3,01/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 02/19] " Mathieu Malaterre
2018-03-23 9:38 ` christophe leroy
2018-03-28 19:30 ` [PATCH v2 " Mathieu Malaterre
2018-03-29 16:09 ` LEROY Christophe
2018-06-22 9:46 ` Mathieu Malaterre
2018-08-13 11:22 ` [v2,02/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 03/19] powerpc: Mark variables " Mathieu Malaterre
2018-03-23 10:03 ` christophe leroy
2018-03-28 19:33 ` [PATCH v2 " Mathieu Malaterre
2018-03-29 16:14 ` LEROY Christophe
2018-04-05 5:57 ` Michael Ellerman
2018-04-05 7:01 ` LEROY Christophe
2018-04-04 20:08 ` [PATCH v3 03/19] powerpc: Move `path` variable inside DEBUG_PROM Mathieu Malaterre
2018-06-22 9:48 ` Mathieu Malaterre
2018-08-13 11:22 ` [v3,03/19] " Michael Ellerman
2018-04-05 20:26 ` [PATCH v4 03/19] powerpc: Mark variable `l` as unused, remove `path` Mathieu Malaterre
2018-04-06 15:33 ` LEROY Christophe
2018-04-06 18:32 ` Mathieu Malaterre [this message]
2018-04-24 19:20 ` christophe leroy
2018-03-22 20:19 ` [PATCH 04/19] powerpc/kvm: Mark variable tmp unused Mathieu Malaterre
2018-03-23 10:08 ` christophe leroy
2018-03-28 19:58 ` [PATCH v2 04/19] powerpc/kvm: Prefer fault_in_pages_readable function Mathieu Malaterre
2018-03-29 16:18 ` LEROY Christophe
2018-05-25 1:59 ` [v2,04/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 05/19] powerpc/chrp/setup: Add attribute unused and make some functions static Mathieu Malaterre
2018-03-23 11:01 ` christophe leroy
2018-03-28 19:35 ` [PATCH v2 " Mathieu Malaterre
2018-03-29 16:16 ` LEROY Christophe
2018-04-04 20:09 ` [PATCH v3 05/19] powerpc/chrp/setup: Remove idu_size variable " Mathieu Malaterre
2018-05-25 11:41 ` [v3, " Michael Ellerman
2018-03-22 20:19 ` [PATCH 06/19] powerpc: Make function btext_initialize static Mathieu Malaterre
2018-05-25 11:41 ` [06/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 07/19] powerpc/powermac: Make some functions static Mathieu Malaterre
2018-03-23 11:05 ` christophe leroy
2018-03-28 19:39 ` [PATCH v2 " Mathieu Malaterre
2018-06-22 11:29 ` Mathieu Malaterre
2018-08-13 11:22 ` [v2,07/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 08/19] powerpc/tau: Make some function static Mathieu Malaterre
2018-05-25 11:41 ` [08/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 09/19] powerpc/chrp/pci: Make some functions static Mathieu Malaterre
2018-04-04 20:15 ` [PATCH v3 " Mathieu Malaterre
2018-05-25 11:41 ` [v3,09/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 10/19] powerpc/chrp/time: Make some functions static, add missing header include Mathieu Malaterre
2018-05-25 11:41 ` [10/19] " Michael Ellerman
2018-03-22 20:19 ` [PATCH 11/19] powerpc/powermac: Move pmac_pfunc_base_install prototype to header file Mathieu Malaterre
2018-03-23 12:13 ` christophe leroy
2018-03-28 19:11 ` Mathieu Malaterre
2018-03-29 15:51 ` LEROY Christophe
2018-04-04 20:13 ` [PATCH v3 " Mathieu Malaterre
2018-05-25 11:41 ` [v3, " Michael Ellerman
2018-03-22 20:19 ` [PATCH 12/19] powerpc/powermac: Add missing prototype for note_bootable_part() Mathieu Malaterre
2018-03-23 12:14 ` christophe leroy
2018-04-04 20:13 ` [PATCH v3 " Mathieu Malaterre
2018-05-25 11:41 ` [v3, " Michael Ellerman
2018-03-22 20:19 ` [PATCH 13/19] powerpc/52xx: Add missing functions prototypes Mathieu Malaterre
2018-03-23 12:18 ` christophe leroy
2018-04-04 20:12 ` [PATCH v3 " Mathieu Malaterre
2018-05-25 11:41 ` [v3,13/19] " Michael Ellerman
2018-03-22 20:20 ` [PATCH 14/19] powerpc/altivec: Add missing prototypes for altivec Mathieu Malaterre
2018-03-23 12:19 ` christophe leroy
2018-03-23 12:24 ` Mathieu Malaterre
2018-03-24 20:10 ` LEROY Christophe
2018-03-27 8:39 ` Mathieu Malaterre
2018-03-27 15:58 ` LEROY Christophe
2018-03-27 17:33 ` LEROY Christophe
2018-03-28 7:26 ` Mathieu Malaterre
2018-03-28 11:53 ` Mathieu Malaterre
2018-03-28 18:47 ` [PATCH v2] " Mathieu Malaterre
2018-03-28 18:55 ` [PATCH v3] " Mathieu Malaterre
2018-05-25 11:41 ` [v3] " Michael Ellerman
2018-03-22 20:20 ` [PATCH 15/19] powerpc: Add missing prototype Mathieu Malaterre
2018-03-23 12:20 ` christophe leroy
2018-03-28 19:13 ` Mathieu Malaterre
2018-03-29 16:02 ` LEROY Christophe
2018-04-04 20:18 ` Mathieu Malaterre
2018-04-04 20:11 ` [PATCH v3 " Mathieu Malaterre
2018-05-25 11:41 ` [v3,15/19] " Michael Ellerman
2018-03-22 20:20 ` [PATCH 16/19] powerpc/powermac: Add missing include of header pmac.h Mathieu Malaterre
2018-06-22 9:49 ` Mathieu Malaterre
2018-08-13 11:22 ` [16/19] " Michael Ellerman
2018-03-22 20:20 ` [PATCH 17/19] powerpc/32: Add a missing include header Mathieu Malaterre
2018-05-25 11:41 ` [17/19] " Michael Ellerman
2018-03-22 20:20 ` [PATCH 18/19] powerpc: " Mathieu Malaterre
2018-05-25 11:41 ` [18/19] " Michael Ellerman
2018-03-22 20:20 ` [PATCH 19/19] powerpc/tau: Synchronize function prototypes and body Mathieu Malaterre
2018-03-23 12:22 ` christophe leroy
2018-04-04 20:10 ` [PATCH v3 " Mathieu Malaterre
2018-05-25 11:41 ` [v3,19/19] " Michael Ellerman
2018-05-22 6:28 ` [PATCH 00/19] powerpc/ppc32: make W=1 compilation errors free Mathieu Malaterre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+7wUswhZHNabB6kAcX8Cu8zMai15RzGn9euwdKau8kY48i-CA@mail.gmail.com \
--to=malat@debian.org \
--cc=benh@kernel.crashing.org \
--cc=christophe.leroy@c-s.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).