From 9a4a740554448e2c3092f1f9eda227867e6bcbb8 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 19 Nov 2015 13:45:41 -0800 Subject: [PATCH] ANDROID: of: Fix build warnings In commit d6cb004d80 (of: fix CONFIG_CMDLINE_EXTEND), the types of some variables in early_init_dt_scan_chosen() were modified, which results in build warnings. This patch resets the unsigned long to an int, and re-adds the const to the char*. Change-Id: Ie60ae92b4552e453cf477dd83f42838b3f95975e Signed-off-by: John Stultz --- drivers/of/fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index f44f979e402d..86688088c50c 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1080,8 +1080,8 @@ static const char *config_cmdline = ""; int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, int depth, void *data) { - unsigned long l = 0; - char *p = NULL; + int l = 0; + const char *p = NULL; char *cmdline = data; pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);