diff options
author | John Stultz <john.stultz@linaro.org> | 2015-11-19 13:45:41 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2015-12-03 13:12:56 -0800 |
commit | a2dbd49b2257e4a30f8172d6cb71fe4592ebff44 (patch) | |
tree | 48471d2aa901a50e56aafc31c532a7e1ebadc5d8 | |
parent | c69bd7a2bea7de3f6f719382f783a6d1c5353acf (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>
-rw-r--r-- | drivers/of/fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 64fea7c23450..c7fe0f785ab1 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -943,8 +943,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); |