aboutsummaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2015-11-19 13:45:41 -0800
committerJohn Stultz <john.stultz@linaro.org>2016-02-16 13:54:09 -0800
commit558c05dbb5aa0ed678462f78b0e1d0e966d2281f (patch)
tree803e5ad86c21e4256b60c5ac372f1d37976d596a /drivers/of
parent409b642dddb87e84d37c0463a5fa06adcf230aa4 (diff)
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 <john.stultz@linaro.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/fdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index b1011218e4f4..86fff625f6d5 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -964,8 +964,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);