[PATCH] of: Fix uninitialized child warning in for_each_child_of_node() if !OF

[Geert Uytterhoeven]

If CONFIG_OF=n:

drivers/i2c/i2c-mux.c: In function âi2c_add_mux_adapterâ:
drivers/i2c/i2c-mux.c:158: warning: âchildâ is used uninitialized in this function
drivers/leds/leds-lp55xx-common.c: In function âlp55xx_of_populate_pdataâ:
drivers/leds/leds-lp55xx-common.c:560: warning: âchildâ is used uninitialized in this function
drivers/leds/leds-pwm.c: In function âled_pwm_probeâ:
drivers/leds/leds-pwm.c:89: warning: âchildâ is used uninitialized in this function
drivers/mfd/stmpe.c: In function âstmpe_of_probeâ:
drivers/mfd/stmpe.c:1112: warning: âchildâ is used uninitialized in this function
drivers/mfd/tc3589x.c: In function âtc3589x_probeâ:
drivers/mfd/tc3589x.c:324: warning: âchildâ is used uninitialized in this function
drivers/power/charger-manager.c: In function âof_cm_parse_descâ:
drivers/power/charger-manager.c:1606: warning: âchildâ is used uninitialized in this function

Introduced by commit 00b2c76a6abbe082bb5afb89ee49ec325e9cd4d2
("include/linux/of.h: make for_each_child_of_node() reference its args when
CONFIG_OF=n").

Instead of dropping the "__of_use_dn(child)" again, explicitly set child
to NULL, to protect against code using child after the loop (child == NULL
is the loop termination condition if CONFIG_OF=y).

Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
---
 include/linux/of.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/of.h b/include/linux/of.h
index 70c64ba17fa5..0bf44f2fe092 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -383,7 +383,7 @@ static inline void __of_use_dn(const struct device_node *np)
 }
 
 #define for_each_child_of_node(parent, child) \
-	while (__of_use_dn(parent), __of_use_dn(child), 0)
+	while (__of_use_dn(parent), child = NULL, 0)
 
 #define for_each_available_child_of_node(parent, child) \
 	while (0)
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/