powerpc/ppc32: make W=1 compilation errors free

Since the value of x is never intended to be read, declare it with gcc attribute as unused. Fix warning treated as error with W=1:

arch/powerpc/platforms/powermac/bootx_init.c:471:21: error: variable ‘x’ set but not used [-Werror=unused-but-set-variable]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/platforms/powermac/bootx_init.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

arch/powerpc/platforms/powermac/bootx_init.c +0 -0

index c3c9bbb3573a..d3ce55dae78f 100644

Since the value of x is never intended to be read, declare it with gcc attribute as unused. Fix warning treated as error with W=1:

arch/powerpc/platforms/powermac/bootx_init.c:471:21: error:
variable ‘x’ set but not used [-Werror=unused-but-set-variable]

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: move x variable within its local scope

 arch/powerpc/platforms/powermac/bootx_init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

arch/powerpc/platforms/powermac/bootx_init.c +1 -1

index c3c9bbb3573a..d44e8571c1ec 100644
@@ -468,7 +468,7 @@ void __init bootx_init(unsigned long r3,  
 unsigned long r4)
 	boot_infos_t *bi = (boot_infos_t *) r4;
 	unsigned long hdr;
 	unsigned long space;
-	unsigned long ptr, x;
+	unsigned long ptr;
 	char *model;
 	unsigned long offset = reloc_offset();

arch/powerpc/platforms/powermac/bootx_init.c +0 -1

 		/*
--

2.11.0

Mathieu Malaterre <[email protected]> a =C3=A9crit :

Quoted 4 lines

Since the value of x is never intended to be read, declare it with gcc attribute as unused. Fix warning treated as error with W=3D1:

arch/powerpc/platforms/powermac/bootx_init.c:471:21: error: variable =

Quoted 9 lines

set but not used [-Werror=3Dunused-but-set-variable]

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: move x variable within its local scope

 arch/powerpc/platforms/powermac/bootx_init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

arch/powerpc/platforms/powermac/bootx_init.c void __init bootx_init(unsigned long r3, unsigned lo=

Quoted 6 lines

arch/powerpc/platforms/powermac/bootx_init.c +0 -0

index c3c9bbb3573a..d44e8571c1ec 100644
@@ -468,7 +468,7 @@ void __init bootx_init(unsigned long r3, unsigned lo=

arch/powerpc/platforms/powermac/bootx_init.c void __init bootx_init(unsigned long r3, unsigned lo=

Quoted 10 lines

arch/powerpc/platforms/powermac/bootx_init.c +1 -1

 r4)
        boot_infos_t *bi =3D (boot_infos_t *) r4;
        unsigned long hdr;
        unsigned long space;
-       unsigned long ptr, x;
+       unsigned long ptr;
        char *model;
        unsigned long offset =3D reloc_offset();

@@ -562,6 +562,7 @@ void __init bootx_init(unsigned long r3, unsigned lo=

arch/powerpc/platforms/powermac/bootx_init.c void __init bootx_init(unsigned long r3, unsigned long r4) · line 566

Quoted 6 lines

arch/powerpc/platforms/powermac/bootx_init.c +1 -0

 r4)
         * MMU switched OFF, so this should not be useful anymore.
         */
        if (bi->version < 4) {
+               unsigned long x __maybe_unused;
                bootx_printf("Touching pages...\n");

Stylewise, there should be an empty line after your declaration.

But I believe you should remove that ugly loop and replace it by a call t=

fault_in_pages_readable()

Christophe

Quoted 5 lines

arch/powerpc/platforms/powermac/bootx_init.c +0 -1

                /*
--

2.11.0

Since the value of x is never intended to be read, declare it with gcc attribute as unused. Fix warning treated as error with W=1:

arch/powerpc/platforms/powermac/bootx_init.c:471:21: error: variable ‘x’ set but not used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
v3: style: add missing empty line after declaration
v2: move x variable within its local scope

  arch/powerpc/platforms/powermac/bootx_init.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

arch/powerpc/platforms/powermac/bootx_init.c +1 -1

index c3c9bbb3573a..ba0964c17620 100644
@@ -468,7 +468,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
  	boot_infos_t *bi = (boot_infos_t *) r4;
  	unsigned long hdr;
  	unsigned long space;
-	unsigned long ptr, x;
+	unsigned long ptr;
  	char *model;
  	unsigned long offset = reloc_offset();
 

arch/powerpc/platforms/powermac/bootx_init.c +0 -0

  		bootx_printf("Touching pages...\n");
 
  		/*

Since the value of x is never intended to be read, declare it with gcc attribute as unused. Fix warning treated as error with W=1:

arch/powerpc/platforms/powermac/bootx_init.c:471:21: error: variable ‘x’ set but not used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

Since the value of x is never intended to be read, declare it with gcc attribute as unused. Fix warning treated as error with W=1:

arch/powerpc/platforms/powermac/udbg_scc.c:76:9: error: variable ‘x’ set but not used [-Werror=unused-but-set-variable]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/platforms/powermac/udbg_scc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

arch/powerpc/platforms/powermac/udbg_scc.c +0 -0

index d83135a9830e..c38ca406df1a 100644

Since the value of x is never intended to be read, remove it. Fix warning treated as error with W=3D1:

arch/powerpc/platforms/powermac/udbg_scc.c:76:9: error: variable=20=20
=20=E2=80=98x=E2=80=99 set but not used [-Werror=3Dunused-but-set-variable=

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: remove x completely

 arch/powerpc/platforms/powermac/udbg_scc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(quoted diff) +0 -0

=20b/arch/powerpc/platforms/powermac/udbg_scc.c
index d83135a9830e..8901973ed683 100644

arch/powerpc/platforms/powermac/udbg_scc.c +2 -3

@@ -73,7 +73,7 @@ void udbg_scc_init(int force_scc)
 	struct device_node *stdout =3D NULL, *escc =3D NULL, *macio =3D NULL;
 	struct device_node *ch, *ch_def =3D NULL, *ch_a =3D NULL;
 	const char *path;
-	int i, x;
+	int i;
 
 	escc =3D of_find_node_by_name(NULL, "escc");
 	if (escc =3D=3D NULL)

@@ -120,7 +120,7 @@ void udbg_scc_init(int force_scc)
 	mb();
 
 	for (i =3D 20000; i !=3D 0; --i)
-		x =3D in_8(sccc);
+		in_8(sccc);
 	out_8(sccc, 0x09);		/* reset A or B side */
 	out_8(sccc, 0xc0);
 
--

2.11.0

Mathieu Malaterre <[email protected]> a =C3=A9crit :

Quoted 1 line

Since the value of x is never intended to be read, remove it. Fix warni=

Quoted 4 lines

treated as error with W=3D1:

arch/powerpc/platforms/powermac/udbg_scc.c:76:9: error: variable
=E2=80=98x=E2=80=99 set but not used [-Werror=3Dunused-but-set-variable=

Quoted 3 lines

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

Reviewed-by Christophe Leroy <[email protected]>

Quoted 6 lines

---
v2: remove x completely

 arch/powerpc/platforms/powermac/udbg_scc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/powerpc/platforms/powermac/udbg_scc.c void udbg_scc_init(int force_scc) · line 73

Quoted 7 lines

arch/powerpc/platforms/powermac/udbg_scc.c +0 -0

index d83135a9830e..8901973ed683 100644
@@ -73,7 +73,7 @@ void udbg_scc_init(int force_scc)
      struct device_node *stdout =3D NULL, *escc =3D NULL, *macio =3D N=

Quoted 18 lines

arch/powerpc/platforms/powermac/udbg_scc.c +2 -3

      struct device_node *ch, *ch_def =3D NULL, *ch_a =3D NULL;
      const char *path;
-     int i, x;
+     int i;
 
      escc =3D of_find_node_by_name(NULL, "escc");
      if (escc =3D=3D NULL)

@@ -120,7 +120,7 @@ void udbg_scc_init(int force_scc)
      mb();
 
      for (i =3D 20000; i !=3D 0; --i)
-             x =3D in_8(sccc);
+             in_8(sccc);
      out_8(sccc, 0x09);              /* reset A or B side */
      out_8(sccc, 0xc0);
 
--

2.11.0

Since the value of x is never intended to be read, remove it. Fix warning treated as error with W=1:

arch/powerpc/platforms/powermac/udbg_scc.c:76:9: error: variable ‘x’ set but not used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

Reviewed-by Christophe Leroy <[email protected]>

Add gcc attribute unused for two variables. Fix warnings treated as errors with W=1:

arch/powerpc/kernel/prom_init.c:1388:8: error: variable ‘path’ set but not used [-Werror=unused-but-set-variable]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/kernel/prom_init.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

arch/powerpc/kernel/prom_init.c +1 -1

index acf4b2e0530c..6a3ac4522144 100644
@@ -603,7 +603,7 @@ static void __init early_cmdline_parse(void)
  	const char *opt;
 
  	char *p;
-	int l = 0;
+	int l __maybe_unused = 0;
 
  	prom_cmd_line[0] = 0;
  	p = prom_cmd_line;

Add gcc attribute unused for two variables. Fix warnings treated as errors with W=1:

arch/powerpc/kernel/prom_init.c:1388:8: error: variable ‘path’ set
but not used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: move path within ifdef DEBUG_PROM

 arch/powerpc/kernel/prom_init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

arch/powerpc/kernel/prom_init.c +1 -1

index acf4b2e0530c..4163b11abb6c 100644
@@ -603,7 +603,7 @@ static void __init early_cmdline_parse(void)
 	const char *opt;
 
 	char *p;
-	int l = 0;
+	int l __maybe_unused = 0;
 
 	prom_cmd_line[0] = 0;
 	p = prom_cmd_line;

arch/powerpc/kernel/prom_init.c +1 -2

 	unsigned int plen;
 	cell_t *p, *endp;
 	__be32 val;

@@ -1406,7 +1406,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;

@@ -1431,6 +1430,7 @@ static void __init prom_init_mem(void)
 		endp = p + (plen / sizeof(cell_t));
 
 #ifdef DEBUG_PROM
+		path = prom_scratch;
 		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);
--

2.11.0

Mathieu Malaterre <[email protected]> a =C3=A9crit=C2=A0:

Quoted 1 line

Add gcc attribute unused for two variables. Fix warnings treated as erro=

Quoted 3 lines

with W=3D1:

arch/powerpc/kernel/prom_init.c:1388:8: error: variable =E2=80=98path=

Quoted 22 lines

but not used [-Werror=3Dunused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: move path within ifdef DEBUG_PROM

 arch/powerpc/kernel/prom_init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

arch/powerpc/kernel/prom_init.c +1 -1

index acf4b2e0530c..4163b11abb6c 100644
@@ -603,7 +603,7 @@ static void __init early_cmdline_parse(void)
 	const char *opt;
 
 	char *p;
-	int l =3D 0;
+	int l __maybe_unused =3D 0;
 

arch/powerpc/kernel/prom_init.c static void __init reserve_mem(u64 base, u64 size) · line 1388

Quoted 8 lines

arch/powerpc/kernel/prom_init.c +1 -1

 	prom_cmd_line[0] =3D 0;
 	p =3D prom_cmd_line;

@@ -1385,7 +1385,7 @@ static void __init reserve_mem(u64 base, u64 size)
 static void __init prom_init_mem(void)
 {
 	phandle node;
-	char *path, type[64];
+	char *path __maybe_unused, type[64];

You should enclose that in an ifdef DEBUG_PROM instead of hiding the warn=

Quoted 3 lines · LEROY Christophe

Mathieu Malaterre <[email protected]> a =C3=A9crit=C2=A0:

Quoted 1 line

Add gcc attribute unused for two variables. Fix warnings treated as err=

Quoted 3 lines

Quoted 3 lines

with W=3D1:

arch/powerpc/kernel/prom_init.c:1388:8: error: variable =E2=80=98path=

Quoted 18 lines

Quoted 18 lines

but not used [-Werror=3Dunused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: move path within ifdef DEBUG_PROM

 arch/powerpc/kernel/prom_init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

arch/powerpc/kernel/prom_init.c +0 -0

index acf4b2e0530c..4163b11abb6c 100644
@@ -603,7 +603,7 @@ static void __init early_cmdline_parse(void)
 	const char *opt;
 

Quoted 7 lines

arch/powerpc/kernel/prom_init.c static void __init reserve_mem(u64 base, u64 size=

Quoted 7 lines

arch/powerpc/kernel/prom_init.c +1 -1

 	char *p;
-	int l =3D 0;
+	int l __maybe_unused =3D 0;
 
 	prom_cmd_line[0] =3D 0;
 	p =3D prom_cmd_line;

@@ -1385,7 +1385,7 @@ static void __init reserve_mem(u64 base, u64 size=

Quoted 7 lines

arch/powerpc/kernel/prom_init.c static void __init reserve_mem(u64 base, u64 size= · line 1388

Quoted 5 lines

arch/powerpc/kernel/prom_init.c +1 -1

 static void __init prom_init_mem(void)
 {
 	phandle node;
-	char *path, type[64];
+	char *path __maybe_unused, type[64];

You should enclose that in an ifdef DEBUG_PROM instead of hiding the war=

I disagree, the result is horrible:

static void __init prom_init_mem(void)

 {
	phandle node;

(quoted diff) +4 -1

-	char *path, type[64];
+#ifdef DEBUG_PROM
+	char *path;
+#endif
+	char type[64];

	unsigned int plen;
	cell_t *p, *endp;
	__be32 val;

The right fix is to move the debug logic into a helper, and put the path in there, eg. something like (not tested):

(quoted diff) +0 -0

=20b/arch/powerpc/kernel/prom_init.c
index f9d6befb55a6..b02fa2ccc70b 100644

arch/powerpc/kernel/prom_init.c +1 -0

@@ -1389,6 +1389,18 @@ static void __init reserve_mem(u64 base, u64 size)
 	mem_reserve_cnt =3D cnt + 1;
 }
 
+#ifdef DEBUG_PROM

arch/powerpc/kernel/prom_init.c +1 -5

@@ -1441,11 +1453,7 @@ static void __init prom_init_mem(void)
 		p =3D regbuf;
 		endp =3D 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);
-#endif /* DEBUG_PROM */
+		prom_debug_path(node);
 
 		while ((endp - p) >=3D (rac + rsc)) {
 			unsigned long base, size;

Although that also begs the question of why the hell do we need path at all, and not just use prom_scratch directly?

cheers

Add gcc attribute unused for two variables. Fix warnings treated as error=

with W=3D1:

arch/powerpc/kernel/prom_init.c:1388:8: error: variable =E2=80=98path=

index acf4b2e0530c..223b35acbbdd 100644

arch/powerpc/kernel/prom_init.c +7 -3

@@ -603,7 +603,7 @@ static void __init early_cmdline_parse(void)
        const char *opt;
 
        char *p;
-       int l =3D 0;
+       int l __maybe_unused =3D 0;
 
        prom_cmd_line[0] =3D 0;
        p =3D prom_cmd_line;

@@ -1385,7 +1385,10 @@ static void __init reserve_mem(u64 base, u64 size)
 static void __init prom_init_mem(void)
 {
        phandle node;
-       char *path, type[64];
+#ifdef DEBUG_PROM
+       char *path;
+#endif
+       char type[64];
        unsigned int plen;
        cell_t *p, *endp;
        __be32 val;

@@ -1406,7 +1409,9 @@ static void __init prom_init_mem(void)
        prom_debug("root_size_cells: %x\n", rsc);
 
        prom_debug("scanning memory:\n");
+#ifdef DEBUG_PROM
        path =3D prom_scratch;
+#endif
 
        for (node =3D 0; prom_next_node(&node); ) {
                type[0] =3D 0;
--

2.11.0

Add gcc attribute unused for two variables. Fix warnings treated as errors with W=1:

arch/powerpc/kernel/prom_init.c:1388:8: error: variable ‘path’ set but not used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

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 <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
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(-)

arch/powerpc/kernel/prom_init.c +0 -0

index f8a9a50ff9b5..4b223a9470be 100644

arch/powerpc/kernel/prom_init.c +4 -5

 	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

Mathieu Malaterre <[email protected]> a =C3=A9crit :

Quoted 5 lines

Add gcc attribute unused for l variable, replace path variable directly
with prom_scratch. Fix warnings treated as errors with W=3D1:

arch/powerpc/kernel/prom_init.c:607:6: error: variable =E2=80=98l=E2=

Quoted 2 lines

used [-Werror=3Dunused-but-set-variable]
arch/powerpc/kernel/prom_init.c:1388:8: error: variable =E2=80=98path=

Quoted 20 lines

not used [-Werror=3Dunused-but-set-variable]

Suggested-by Michael Ellerman <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
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(-)

arch/powerpc/kernel/prom_init.c +0 -0

index f8a9a50ff9b5..4b223a9470be 100644
@@ -604,7 +604,7 @@ static void __init early_cmdline_parse(void)
        const char *opt;
 

arch/powerpc/kernel/prom_init.c static void __init early_cmdline_parse(void) · line 607

Quoted 3 lines

arch/powerpc/kernel/prom_init.c +1 -1

        char *p;
-       int l =3D 0;
+       int l __maybe_unused =3D 0;

Instead of hiding the problem with __maybe_unused, I think we could repla=

the
#ifdef CONFIG_CMDLINE
by a
if (IS_ENABLED(CONFIG_CMDLINE_BOOL))

This is recommanded by Linux codying style

Christophe

Quoted 37 lines

arch/powerpc/kernel/prom_init.c +4 -5

        prom_cmd_line[0] =3D 0;
        p =3D 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 =3D prom_scratch;
 
        for (node =3D 0; prom_next_node(&node); ) {
                type[0] =3D 0;

@@ -1432,9 +1431,9 @@ static void __init prom_init_mem(void)
                endp =3D 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) >=3D (rac + rsc)) {

--
2.11.0

Quoted 40 lines · LEROY Christophe

Quoted 25 lines · Mathieu Malaterre

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 <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
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(-)

arch/powerpc/kernel/prom_init.c +0 -0

index f8a9a50ff9b5..4b223a9470be 100644

arch/powerpc/kernel/prom_init.c static void __init early_cmdline_parse(void) · line 607

Quoted 5 lines

arch/powerpc/kernel/prom_init.c +1 -1

@@ -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))

Quoted 1 line

This is recommanded by Linux codying style

Neat. I was not aware of this trick. Does not work in this case though:

arch/powerpc/kernel/prom_init.c +5 -6

index 7925f64fefde..19634739b279 100644
@@ -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

Quoted 39 lines

Christophe

Quoted 34 lines

arch/powerpc/kernel/prom_init.c +4 -5

         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 */

Quoted 6 lines

Quoted 3 lines

                 while ((endp - p) >= (rac + rsc)) {

--
2.11.0

Add gcc attribute unused to variable tmp. Fix warning treated as error with W=1:

arch/powerpc/kernel/kvm.c:675:6: error: variable ‘tmp’ set but not used [-Werror=unused-but-set-variable]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/kernel/kvm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

arch/powerpc/kernel/kvm.c +0 -0

index 9ad37f827a97..cd3c088283f9 100644

Directly use fault_in_pages_readable instead of manual __get_user code. Fix warning treated as error with W=1:

arch/powerpc/kernel/kvm.c:675:6: error: variable ‘tmp’ set but not
used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: use fault_in_pages_readable instead

 arch/powerpc/kernel/kvm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/powerpc/kernel/kvm.c +2 -3

index 9ad37f827a97..124c51030b75 100644
@@ -25,6 +25,7 @@
 #include <linux/kvm_para.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/pagemap.h>
 
 #include <asm/reg.h>
 #include <asm/sections.h>

@@ -672,14 +673,13 @@ static void kvm_use_magic_page(void)
 {
 	u32 *p;
 	u32 *start, *end;
-	u32 tmp;
 	u32 features;
 
 	/* Tell the host to map the magic page to -4096 on all CPUs */
 	on_each_cpu(kvm_map_magic_page, &features, 1);
 
 	/* Quick self-test to see if the mapping works */
-	if (__get_user(tmp, (u32*)KVM_MAGIC_PAGE)) {
+	if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
 		kvm_patching_worked = false;
 		return;
 	}
--

2.11.0

Directly use fault_in_pages_readable instead of manual __get_user code. Fix warning treated as error with W=1:

arch/powerpc/kernel/kvm.c:675:6: error: variable ‘tmp’ set but not used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

Reviewed-by Christophe Leroy <[email protected]>

Add gcc attribute unused to silence a warning.

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/platforms/chrp/setup.c:97:6: error: no previous prototype for ‘chrp_show_cpuinfo’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/setup.c:302:13: error: no previous prototype for ‘chrp_setup_arch’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/setup.c:385:16: error: variable ‘idu_size’ set but not used [-Werror=unused-but-set-variable] arch/powerpc/platforms/chrp/setup.c:526:13: error: no previous prototype for ‘chrp_init_IRQ’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/setup.c:559:1: error: no previous prototype for ‘chrp_init2’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/platforms/chrp/setup.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

arch/powerpc/platforms/chrp/setup.c +2 -2

index 481ed133e04b..85df479fd631 100644
@@ -94,7 +94,7 @@ static const char *chrp_names[] = {
  	"Total Impact Briq"
  };
 
-void chrp_show_cpuinfo(struct seq_file *m)
+static void chrp_show_cpuinfo(struct seq_file *m)
  {
  	int i, sdramen;
  	unsigned int t;

@@ -299,7 +299,7 @@ static __init void chrp_init(void)
  	of_node_put(node);
  }
 
-void __init chrp_setup_arch(void)
+static void __init chrp_setup_arch(void)
  {
  	struct device_node *root = of_find_node_by_path("/");
  	const char *machine = NULL;

arch/powerpc/platforms/chrp/setup.c +1 -1

  	const unsigned int *iranges, *opprop = NULL;
  	int oplen = 0;
  	unsigned long opaddr;

@@ -523,7 +523,7 @@ static void __init chrp_find_8259(void)
  	}
  }
 
-void __init chrp_init_IRQ(void)
+static void __init chrp_init_IRQ(void)
  {
  #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_XMON)
  	struct device_node *kbd;

Remove variable declaration idu_size and associated code since not used.

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/platforms/chrp/setup.c:97:6: error: no previous
prototype for ‘chrp_show_cpuinfo’ [-Werror=missing-prototypes]
arch/powerpc/platforms/chrp/setup.c:302:13: error: no previous
prototype for ‘chrp_setup_arch’ [-Werror=missing-prototypes]
arch/powerpc/platforms/chrp/setup.c:385:16: error: variable
‘idu_size’ set but not used [-Werror=unused-but-set-variable]
arch/powerpc/platforms/chrp/setup.c:526:13: error: no previous
prototype for ‘chrp_init_IRQ’ [-Werror=missing-prototypes]
arch/powerpc/platforms/chrp/setup.c:559:1: error: no previous
prototype for ‘chrp_init2’ [-Werror=missing-prototypes]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
v2: Remove totally variable idu_size

 arch/powerpc/platforms/chrp/setup.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

arch/powerpc/platforms/chrp/setup.c +4 -6

index 481ed133e04b..d6d8ffc0271e 100644
@@ -94,7 +94,7 @@ static const char *chrp_names[] = {
 	"Total Impact Briq"
 };
 
-void chrp_show_cpuinfo(struct seq_file *m)
+static void chrp_show_cpuinfo(struct seq_file *m)
 {
 	int i, sdramen;
 	unsigned int t;

@@ -299,7 +299,7 @@ static __init void chrp_init(void)
 	of_node_put(node);
 }
 
-void __init chrp_setup_arch(void)
+static void __init chrp_setup_arch(void)
 {
 	struct device_node *root = of_find_node_by_path("/");
 	const char *machine = NULL;

@@ -382,7 +382,7 @@ static void __init chrp_find_openpic(void)
 {
 	struct device_node *np, *root;
 	int len, i, j;
-	int isu_size, idu_size;
+	int isu_size;
 	const unsigned int *iranges, *opprop = NULL;
 	int oplen = 0;
 	unsigned long opaddr;

@@ -427,11 +427,9 @@ static void __init chrp_find_openpic(void)
 	}
 
 	isu_size = 0;
-	idu_size = 0;
 	if (len > 0 && iranges[1] != 0) {
 		printk(KERN_INFO "OpenPIC irqs %d..%d in IDU\n",
 		       iranges[0], iranges[0] + iranges[1] - 1);
-		idu_size = iranges[1];
 	}
 	if (len > 1)
 		isu_size = iranges[3];

@@ -523,7 +521,7 @@ static void __init chrp_find_8259(void)
 	}
 }
 
-void __init chrp_init_IRQ(void)
+static void __init chrp_init_IRQ(void)
 {
 #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) &&  
 defined(CONFIG_XMON)

arch/powerpc/platforms/chrp/setup.c +1 -2

 	struct device_node *kbd;

@@ -555,7 +553,7 @@ void __init chrp_init_IRQ(void)
 #endif
 }
 
-void __init
+static void __init
 chrp_init2(void)
 {
 #ifdef CONFIG_NVRAM
--

2.11.0

Remove variable declaration idu_size and associated code since not used.

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/platforms/chrp/setup.c:97:6: error: no previous prototype for ‘chrp_show_cpuinfo’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/setup.c:302:13: error: no previous prototype for ‘chrp_setup_arch’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/setup.c:385:16: error: variable ‘idu_size’ set but not used [-Werror=unused-but-set-variable] arch/powerpc/platforms/chrp/setup.c:526:13: error: no previous prototype for ‘chrp_init_IRQ’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/setup.c:559:1: error: no previous prototype for ‘chrp_init2’ [-Werror=missing-prototypes]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

This function can be static, make it so, this fix a warning treated as error with W=1:

arch/powerpc/kernel/btext.c:173:5: error: no previous prototype for ‘btext_initialize’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/platforms/powermac/pci.c:1022:6: error: no previous prototype for ‘pmac_pci_fixup_ohci’ [-Werror=missing-prototypes] arch/powerpc/platforms/powermac/pci.c:1057:6: error: no previous prototype for ‘pmac_pci_fixup_cardbus’ [-Werror=missing-prototypes] arch/powerpc/platforms/powermac/pci.c:1094:6: error: no previous prototype for ‘pmac_pci_fixup_pciata’ [-Werror=missing-prototypes]

Also add gcc attribute unused to fix a warning treated as error with W=1:

arch/powerpc/platforms/powermac/pci.c:784:19: error: variable ‘has_address’ set but not used [-Werror=unused-but-set-variable] arch/powerpc/platforms/powermac/pci.c:907:22: error: variable ‘ht’ set but not used [-Werror=unused-but-set-variable]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/platforms/powermac/pci.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

arch/powerpc/platforms/powermac/pci.c +0 -0

index 0b8174a79993..d3b9818dd880 100644

arch/powerpc/platforms/powermac/pci.c +2 -2

  	pci_set_flags(PCI_CAN_SKIP_ISA_ALIGN);
 

@@ -1019,7 +1019,7 @@ static bool pmac_pci_enable_device_hook(struct pci_dev *dev)
  	return true;
  }
 
-void pmac_pci_fixup_ohci(struct pci_dev *dev)
+static void pmac_pci_fixup_ohci(struct pci_dev *dev)
  {
  	struct device_node *node = pci_device_to_OF_node(dev);
 

@@ -1054,7 +1054,7 @@ void __init pmac_pcibios_after_init(void)
  	}
  }
 
-void pmac_pci_fixup_cardbus(struct pci_dev* dev)
+static void pmac_pci_fixup_cardbus(struct pci_dev *dev)
  {
  	if (!machine_is(powermac))
  		return;

These functions can all be static, make it so. Fix warnings treated as errors with W=3D1:

arch/powerpc/platforms/powermac/pci.c:1022:6: error: no previous protot=

arch/powerpc/platforms/powermac/pci.c:1057:6: error: no previous protot=

arch/powerpc/platforms/powermac/pci.c:1094:6: error: no previous protot=

Remove has_address declaration and assignment since not used. Also add gc=

attribute unused to fix a warning treated as error with W=3D1:

arch/powerpc/platforms/powermac/pci.c:784:19: error: variable =E2=80=98=

arch/powerpc/platforms/powermac/pci.c:907:22: error: variable =E2=80=98=

arch/powerpc/platforms/powermac/pci.c +2 -2

        return true;
 }
 
-void pmac_pci_fixup_ohci(struct pci_dev *dev)
+static void pmac_pci_fixup_ohci(struct pci_dev *dev)
 {
        struct device_node *node =3D pci_device_to_OF_node(dev);
 

@@ -1054,7 +1054,7 @@ void __init pmac_pcibios_after_init(void)
        }
 }
 
-void pmac_pci_fixup_cardbus(struct pci_dev* dev)
+static void pmac_pci_fixup_cardbus(struct pci_dev *dev)
 {
        if (!machine_is(powermac))
                return;

arch/powerpc/platforms/powermac/pci.c +1 -2

-void pmac_pci_fixup_pciata(struct pci_dev* dev)
+static void pmac_pci_fixup_pciata(struct pci_dev *dev)
 {
        u8 progif =3D 0;
 
--

2.11.0

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/platforms/powermac/pci.c:1022:6: error: no previous prototype for ‘pmac_pci_fixup_ohci’ [-Werror=missing-prototypes] arch/powerpc/platforms/powermac/pci.c:1057:6: error: no previous prototype for ‘pmac_pci_fixup_cardbus’ [-Werror=missing-prototypes] arch/powerpc/platforms/powermac/pci.c:1094:6: error: no previous prototype for ‘pmac_pci_fixup_pciata’ [-Werror=missing-prototypes]

Remove has_address declaration and assignment since not used. Also add gcc attribute unused to fix a warning treated as error with W=1:

arch/powerpc/platforms/powermac/pci.c:784:19: error: variable ‘has_address’ set but not used [-Werror=unused-but-set-variable] arch/powerpc/platforms/powermac/pci.c:907:22: error: variable ‘ht’ set but not used [-Werror=unused-but-set-variable]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/kernel/tau_6xx.c:53:6: error: no previous prototype for ‘set_thresholds’ [-Werror=missing-prototypes] arch/powerpc/kernel/tau_6xx.c:73:6: error: no previous prototype for ‘TAUupdate’ [-Werror=missing-prototypes] arch/powerpc/kernel/tau_6xx.c:208:13: error: no previous prototype for ‘TAU_init_smp’ [-Werror=missing-prototypes] arch/powerpc/kernel/tau_6xx.c:220:12: error: no previous prototype for ‘TAU_init’ [-Werror=missing-prototypes] arch/powerpc/kernel/tau_6xx.c:126:6: error: no previous prototype for ‘TAUException’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/platforms/chrp/pci.c:34:5: error: no previous prototype for ‘gg2_read_config’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/pci.c:61:5: error: no previous prototype for ‘gg2_write_config’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/pci.c:97:5: error: no previous prototype for ‘rtas_read_config’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/pci.c:112:5: error: no previous prototype for ‘rtas_write_config’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

Add a missing include <platforms/chrp/chrp.h>.

These functions can all be static, make it so. Fix warnings treated as errors with W=1:

arch/powerpc/platforms/chrp/time.c:41:13: error: no previous prototype for ‘chrp_time_init’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/time.c:66:5: error: no previous prototype for ‘chrp_cmos_clock_read’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/time.c:74:6: error: no previous prototype for ‘chrp_cmos_clock_write’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/time.c:86:5: error: no previous prototype for ‘chrp_set_rtc_time’ [-Werror=missing-prototypes] arch/powerpc/platforms/chrp/time.c:130:6: error: no previous prototype for ‘chrp_get_rtc_time’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

The pmac_pfunc_base_install prototype was declared in powermac/smp.c since function was used there, move it to pmac_pfunc.h header to be visible in pfunc_base.c. Fix a warning treated as error with W=1:

arch/powerpc/platforms/powermac/pfunc_base.c:330:12: error: no previous prototype for ‘pmac_pfunc_base_install’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/include/asm/pmac_pfunc.h | 1 +
  arch/powerpc/platforms/powermac/smp.c | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)

arch/powerpc/include/asm/pmac_pfunc.h +0 -0

index 73bd8f28f2a8..99f7a288789a 100644

arch/powerpc/include/asm/pmac_pfunc.h +0 -0

  /* Suspend/resume code called by via-pmu directly for now */
  extern void pmac_pfunc_base_suspend(void);

arch/powerpc/platforms/powermac/smp.c +0 -0

index 95275e0e2efa..447da6db450a 100644

Le 22/03/2018 =C3=A0 21:19, Mathieu Malaterre a =C3=A9crit :

Quoted 2 lines

The pmac_pfunc_base_install prototype was declared in powermac/smp.c sin=

Quoted 4 lines

function was used there, move it to pmac_pfunc.h header to be visible in pfunc_base.c. Fix a warning treated as error with W=3D1:

arch/powerpc/platforms/powermac/pfunc_base.c:330:12: error: no previo=

Quoted 1 line

prototype for =E2=80=98pmac_pfunc_base_install=E2=80=99 [-Werror=3Dmissi=

Quoted 7 lines

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/include/asm/pmac_pfunc.h | 1 +
  arch/powerpc/platforms/powermac/smp.c | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)

arch/powerpc/include/asm/pmac_pfunc.h extern void pmf_put_function(struct pmf_function · line 248

Quoted 10 lines

arch/powerpc/include/asm/pmac_pfunc.h +0 -0

index 73bd8f28f2a8..99f7a288789a 100644
@@ -245,6 +245,7 @@ extern void pmf_put_function(struct pmf_function
 *func);
    extern int pmf_call_one(struct pmf_function *func, struct pmf_args
 *args);
  +extern int pmac_pfunc_base_install(void);

extern keyword is not needed

Christophe

Quoted 9 lines

arch/powerpc/include/asm/pmac_pfunc.h +0 -0

    /* Suspend/resume code called by via-pmu directly for now */
  extern void pmac_pfunc_base_suspend(void);

arch/powerpc/platforms/powermac/smp.c +0 -0

index 95275e0e2efa..447da6db450a 100644
@@ -65,7 +65,6 @@
  #endif

arch/powerpc/platforms/powermac/smp.c

Quoted 5 lines

arch/powerpc/platforms/powermac/smp.c +0 -1

    extern void __secondary_start_pmac_0(void);
-extern int pmac_pfunc_base_install(void);
    static void (*pmac_tb_freeze)(int freeze);
  static u64 timebase;
 

---
L'absence de virus dans ce courrier =C3=A9lectronique a =C3=A9t=C3=A9 v=

logiciel antivirus Avast.
https://www.avast.com/antivirus

Quoted 17 lines · christophe leroy

Quoted 14 lines · Mathieu Malaterre

The pmac_pfunc_base_install prototype was declared in powermac/smp.c since function was used there, move it to pmac_pfunc.h header to be visible in pfunc_base.c. Fix a warning treated as error with W=1:

arch/powerpc/platforms/powermac/pfunc_base.c:330:12: error: no previous
prototype for ‘pmac_pfunc_base_install’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/include/asm/pmac_pfunc.h | 1 +
  arch/powerpc/platforms/powermac/smp.c | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)

Quoted 14 lines

arch/powerpc/include/asm/pmac_pfunc.h extern void pmf_put_function(struct pmf_function · line 248

Quoted 10 lines

arch/powerpc/include/asm/pmac_pfunc.h +0 -0

index 73bd8f28f2a8..99f7a288789a 100644
@@ -245,6 +245,7 @@ extern void pmf_put_function(struct pmf_function
 *func);
    extern int pmf_call_one(struct pmf_function *func, struct pmf_args
 *args);
  +extern int pmac_pfunc_base_install(void);

extern keyword is not needed

I understand; but for consistency every single protoypes in this header file actually use the extern keyword. Is there a guide/best practice to refer to in this case ?

Quoted 23 lines

Christophe

Quoted 8 lines

arch/powerpc/include/asm/pmac_pfunc.h +0 -0

    /* Suspend/resume code called by via-pmu directly for now */
  extern void pmac_pfunc_base_suspend(void);

arch/powerpc/platforms/powermac/smp.c +0 -0

index 95275e0e2efa..447da6db450a 100644

arch/powerpc/platforms/powermac/smp.c line 69

Quoted 6 lines

arch/powerpc/platforms/powermac/smp.c +0 -1

@@ -65,7 +65,6 @@
  #endif
    extern void __secondary_start_pmac_0(void);
-extern int pmac_pfunc_base_install(void);
    static void (*pmac_tb_freeze)(int freeze);
  static u64 timebase;
 

---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
https://www.avast.com/antivirus

The pmac_pfunc_base_install prototype was declared in powermac/smp.c since function was used there, move it to pmac_pfunc.h header to be visible in pfunc_base.c. Fix a warning treated as error with W=1:

arch/powerpc/platforms/powermac/pfunc_base.c:330:12: error: no previous prototype for ‘pmac_pfunc_base_install’ [-Werror=missing-prototypes]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

Add a missing prototype for function note_bootable_part to silence a warning treated as error with W=1:

arch/powerpc/platforms/powermac/setup.c:361:12: error: no previous prototype for ‘note_bootable_part’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/platforms/powermac/setup.c | 1 +
  1 file changed, 1 insertion(+)

arch/powerpc/platforms/powermac/setup.c +0 -0

index ab668cb72263..e3d00f8af441 100644

Add a missing prototype for function note_bootable_part to silence a warning treated as error with W=1:

arch/powerpc/platforms/powermac/setup.c:361:12: error: no previous prototype for ‘note_bootable_part’ [-Werror=missing-prototypes]

Suggested-by Christophe Leroy <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

The function prototypes were declared within a #ifdef CONFIG_PPC_LITE5200 block which would prevent them from being visible when compiling mpc52xx_pm.c. Move the prototypes outside of the #ifdef block to fix the following warnings treated as errors with W=1:

arch/powerpc/platforms/52xx/mpc52xx_pm.c:58:5: error: no previous prototype for ‘mpc52xx_pm_prepare’ [-Werror=missing-prototypes] arch/powerpc/platforms/52xx/mpc52xx_pm.c:113:5: error: no previous prototype for ‘mpc52xx_pm_enter’ [-Werror=missing-prototypes] arch/powerpc/platforms/52xx/mpc52xx_pm.c:181:6: error: no previous prototype for ‘mpc52xx_pm_finish’ [-Werror=missing-prototypes]

Signed-off-by Mathieu Malaterre <[email protected]>

---
  arch/powerpc/include/asm/mpc52xx.h | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

arch/powerpc/include/asm/mpc52xx.h +0 -1

index e94cede14522..0f6b3cbb119f 100644
@@ -350,14 +350,14 @@ extern struct mpc52xx_suspend mpc52xx_suspend;
  extern int __init mpc52xx_pm_init(void);
  extern int mpc52xx_set_wakeup_gpio(u8 pin, u8 level);
 
-#ifdef CONFIG_PPC_LITE5200