ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info

[geert@linux-m68k.org (Geert Uytterhoeven)]

On Tue, May 24, 2011 at 02:59, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org> wrote:
> ? ?ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info
>
> ? ?The set_vpp() method provided by physmap passes a map_info back to
> ? ?the platform code, which has little relevance as far as the platform
> ? ?is concerned (this parameter is completely unused).
>
> ? ?Instead, pass the platform_device, which can be used in the pismo
> ? ?driver to retrieve some important information in a nicer way, instead
> ? ?of the hack that was in place.
>
> ? ?The empty set_vpp function in board-at572d940hf_ek.c is left untouched,
> ? ?as the board/SoC is scheduled for removal.
>
> ? ?Cc: Andrew Victor <linux@maxim.org.za>
> ? ?Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ? ?Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ? ?Cc: Philipp Zabel <philipp.zabel@gmail.com>
> ? ?Cc: Eric Miao <eric.y.miao@gmail.com>
> ? ?Cc: Ben Dooks <ben-linux@fluff.org>
> ? ?Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
> ? ?Acked-by: David Woodhouse <dwmw2@infradead.org>
> ? ?Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ? ?Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

> --- a/include/linux/mtd/physmap.h
> +++ b/include/linux/mtd/physmap.h
> @@ -24,7 +24,7 @@ struct physmap_flash_data {
> ? ? ? ?unsigned int ? ? ? ? ? ?width;
> ? ? ? ?int ? ? ? ? ? ? ? ? ? ? (*init)(struct platform_device *);
> ? ? ? ?void ? ? ? ? ? ? ? ? ? ?(*exit)(struct platform_device *);
> - ? ? ? void ? ? ? ? ? ? ? ? ? ?(*set_vpp)(struct map_info *, int);
> + ? ? ? void ? ? ? ? ? ? ? ? ? ?(*set_vpp)(struct platform_device *, int);
> ? ? ? ?unsigned int ? ? ? ? ? ?nr_parts;
> ? ? ? ?unsigned int ? ? ? ? ? ?pfow_base;
> ? ? ? ?char ? ? ? ? ? ? ? ? ? ?*probe_type;

You forgot to update the set_vpp parameter of physmap_configure():

void physmap_configure(unsigned long addr, unsigned long size,
                int bankwidth, void (*set_vpp)(struct map_info *, int) );

causing

drivers/mtd/maps/physmap.c: In function ?physmap_configure?:
drivers/mtd/maps/physmap.c:255: warning: assignment from incompatible
pointer type

Interestingly, there are no (in-tree) users of physmap_configure()?

Gr{oetje,eeting}s,

? ? ? ? ? ? ? ? ? ? ? ? Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
? ? ? ? ? ? ? ? ? ? ? ? ? ?? ?? -- Linus Torvalds