Skip to contentSkip to conversation

powerpc: Remove variable ‘path’ since not used

PATCH Applied Mathieu Malaterre 2 participants 2 messages May 23, 2019 – Jun 3, 2019 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: Remove variable ‘path’ since not used

In commit eab00a208eb6 ("powerpc: Move path variable inside DEBUG_PROM") DEBUG_PROM sentinels were added to silence a warning (treated as error with W=1):

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

Rework the original patch and simplify the code, by removing the variable ‘path’ completely. Fix line over 90 characters.

---
 arch/powerpc/kernel/prom_init.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
arch/powerpc/kernel/prom_init.c +4 -9
index 7edb23861162..f6df4ddebb82 100644
@@ -1566,9 +1566,6 @@ static void __init reserve_mem(u64 base, u64 size)
 static void __init prom_init_mem(void)
 {
 	phandle node;
-#ifdef DEBUG_PROM
-	char *path;
-#endif
 	char type[64];
 	unsigned int plen;
 	cell_t *p, *endp;
@@ -1590,9 +1587,6 @@ static void __init prom_init_mem(void)
 	prom_debug("root_size_cells: %x\n", rsc);
 
 	prom_debug("scanning memory:\n");
-#ifdef DEBUG_PROM
-	path = prom_scratch;
-#endif
 
 	for (node = 0; prom_next_node(&node); ) {
 		type[0] = 0;
@@ -1617,9 +1611,10 @@ static void __init prom_init_mem(void)
 		endp = p + (plen / sizeof(cell_t));
 
 #ifdef DEBUG_PROM
-		memset(path, 0, sizeof(prom_scratch));
-		call_prom("package-to-path", 3, 1, node, path, sizeof(prom_scratch) - 1);
-		prom_debug("  node %s :\n", path);
+		memset(prom_scratch, 0, sizeof(prom_scratch));
+		call_prom("package-to-path", 3, 1, node, prom_scratch,
+			  sizeof(prom_scratch) - 1);
+		prom_debug("  node %s :\n", prom_scratch);
 #endif /* DEBUG_PROM */
 
 		while ((endp - p) >= (rac + rsc)) {
Signature · 1 line
2.20.1
#1 lore raw
Quoted 11 lines · Mathieu Malaterre

In commit eab00a208eb6 ("powerpc: Move path variable inside DEBUG_PROM") DEBUG_PROM sentinels were added to silence a warning (treated as error with W=1):

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

Rework the original patch and simplify the code, by removing the variable ‘path’ completely. Fix line over 90 characters.

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/c806a6fde1c29e7419afcf94d761827a

cheers