diff options
author | Rob Herring <robh@kernel.org> | 2014-04-02 00:49:03 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-04-30 01:59:15 -0400 |
commit | 9d0c4dfedd96ee54fc075b16d02f82499c8cc3a6 (patch) | |
tree | bb76a58e00f5aa436c51c1db9841e89ab102d004 /arch/powerpc/platforms/pseries/setup.c | |
parent | bba04d965d06abbbe10afd3687742389107e198e (diff) |
of/fdt: update of_get_flat_dt_prop in prep for libfdt
Make of_get_flat_dt_prop arguments compatible with libfdt fdt_getprop
call in preparation to convert FDT code to use libfdt. Make the return
value const and the property length ptr type an int.
Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 2db8cc691bf4..099d2df976a2 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -665,7 +665,7 @@ static int __init pseries_probe_fw_features(unsigned long node, | |||
665 | void *data) | 665 | void *data) |
666 | { | 666 | { |
667 | const char *prop; | 667 | const char *prop; |
668 | unsigned long len; | 668 | int len; |
669 | static int hypertas_found; | 669 | static int hypertas_found; |
670 | static int vec5_found; | 670 | static int vec5_found; |
671 | 671 | ||
@@ -698,7 +698,7 @@ static int __init pseries_probe_fw_features(unsigned long node, | |||
698 | static int __init pSeries_probe(void) | 698 | static int __init pSeries_probe(void) |
699 | { | 699 | { |
700 | unsigned long root = of_get_flat_dt_root(); | 700 | unsigned long root = of_get_flat_dt_root(); |
701 | char *dtype = of_get_flat_dt_prop(root, "device_type", NULL); | 701 | const char *dtype = of_get_flat_dt_prop(root, "device_type", NULL); |
702 | 702 | ||
703 | if (dtype == NULL) | 703 | if (dtype == NULL) |
704 | return 0; | 704 | return 0; |