diff options
| author | John Stultz <john.stultz@linaro.org> | 2015-11-19 13:45:41 -0800 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2016-01-11 09:50:29 +0530 |
| commit | 3940410d2014bedc7e606fd63ec2bdd855641516 (patch) | |
| tree | e586e6ccb65c837781d808cc9f369cd72a09ccda | |
| parent | efd8da27dccf75f1b8f1ae3f486a39af0bf4b95d (diff) | |
| download | linaro-android-3940410d2014bedc7e606fd63ec2bdd855641516.tar.gz | |
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 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); |