• G
    ARM: shmobile: rcar-gen2: Update for of_get_flat_dt_prop() update · 83850b04
    Geert Uytterhoeven 提交于
    Commit 9d0c4dfe ("of/fdt: update
    of_get_flat_dt_prop in prep for libfdt") changed the function prototypes
    of of_get_flat_dt_prop():
      - The return type was made const,
      - The last parameter was changed from "unsigned long *" to "int *".
    and dt_mem_next_cell():
      - The second parameter was made const.
    
    This causes the following compiler warnings:
    
    arch/arm/mach-shmobile/setup-rcar-gen2.c: In function 'rcar_gen2_scan_mem':
    arch/arm/mach-shmobile/setup-rcar-gen2.c:125:15: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
    arch/arm/mach-shmobile/setup-rcar-gen2.c:142:2: warning: passing argument 3 of 'of_get_flat_dt_prop' from incompatible pointer type [enabled by default]
    include/linux/of_fdt.h:53:20: note: expected 'int *' but argument is of type 'long unsigned int *'
    arch/arm/mach-shmobile/setup-rcar-gen2.c:142:6: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
    arch/arm/mach-shmobile/setup-rcar-gen2.c:144:3: warning: passing argument 3 of 'of_get_flat_dt_prop' from incompatible pointer type [enabled by default]
    include/linux/of_fdt.h:53:20: note: expected 'int *' but argument is of type 'long unsigned int *'
    arch/arm/mach-shmobile/setup-rcar-gen2.c:144:7: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
    arch/arm/mach-shmobile/setup-rcar-gen2.c:152:3: warning: passing argument 2 of 'dt_mem_next_cell' from incompatible pointer type [enabled by default]
    include/linux/of_fdt.h:69:12: note: expected 'const __be32 **' but argument is of type '__be32 **'
    arch/arm/mach-shmobile/setup-rcar-gen2.c:153:3: warning: passing argument 2 of 'dt_mem_next_cell' from incompatible pointer type [enabled by default]
    include/linux/of_fdt.h:69:12: note: expected 'const __be32 **' but argument is of type '__be32 **'
    
    Update the variable types in rcar_gen2_scan_mem() to fix this.
    Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
    Acked-by: NMagnus Damm <damm+renesas@opensource.se>
    [horms+renesas@verge.net.au: rebased]
    Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
    83850b04
setup-rcar-gen2.c 4.7 KB