[PATCH] mtd/physmap: Fix set_vpp signature in physmap_configure

[PATCH] mtd/physmap: Fix set_vpp signature in physmap_configure

[Grant Likely]

physmap_configure() has the wrong signature for the set_vpp callback.
struct physmap_flash_data expects it to accpet a platform_device
pointer.

However, I can't find any users of physmap_configure(), so maybe the
hook should simply be removed.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
 drivers/mtd/maps/physmap.c  |    2 +-
 include/linux/mtd/physmap.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index f64cee4..f2b9f5e 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -247,7 +247,7 @@ static struct platform_device physmap_flash = {
 };
 
 void physmap_configure(unsigned long addr, unsigned long size,
-		int bankwidth, void (*set_vpp)(struct map_info *, int))
+		int bankwidth, void (*set_vpp)(struct platform_device *, int))
 {
 	physmap_flash_resource.start = addr;
 	physmap_flash_resource.end = addr + size - 1;
diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h
index e5f21d2..25ef3ed 100644
--- a/include/linux/mtd/physmap.h
+++ b/include/linux/mtd/physmap.h
@@ -36,7 +36,7 @@ struct physmap_flash_data {
  * Board needs to specify the exact mapping during their setup time.
  */
 void physmap_configure(unsigned long addr, unsigned long size,
-		int bankwidth, void (*set_vpp)(struct map_info *, int) );
+		int bankwidth, void (*set_vpp)(struct platform_device *, int) );
 
 /*
  * Machines that wish to do flash partition may want to call this function in
-- 
1.7.4.1

Re: [PATCH] mtd/physmap: Fix set_vpp signature in physmap_configure

[Artem Bityutskiy]

On Thu, 2011-08-04 at 23:53 +0100, Grant Likely wrote:
> physmap_configure() has the wrong signature for the set_vpp callback.
> struct physmap_flash_data expects it to accpet a platform_device
> pointer.
> 
> However, I can't find any users of physmap_configure(), so maybe the
> hook should simply be removed.
> 
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

We have the following patch in l2-mtd-2.6.git waiting for being merged:

commit a0b50813e689760de9ccd85e1b29906c2540a7e0
Author: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date:   Thu Jun 2 18:51:14 2011 +0400

    mtd: drop physmap_configure
    
    physmap_configure() and physmap_set_partitions() have no users in kernel.
    Out of kernel users should have been converted to regular platform device
    long ago. Drop support for this obsolete API.
    
    Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index f64cee4..2174d10 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -245,21 +245,6 @@ static struct platform_device physmap_flash = {
        .num_resources  = 1,
        .resource       = &physmap_flash_resource,
 };
-
-void physmap_configure(unsigned long addr, unsigned long size,
-               int bankwidth, void (*set_vpp)(struct map_info *, int))
-{
-       physmap_flash_resource.start = addr;
-       physmap_flash_resource.end = addr + size - 1;
-       physmap_flash_data.width = bankwidth;
-       physmap_flash_data.set_vpp = set_vpp;
-}
-
-void physmap_set_partitions(struct mtd_partition *parts, int num_parts)
-{
-       physmap_flash_data.nr_parts = num_parts;
-       physmap_flash_data.parts = parts;
-}
 #endif
 
 static int __init physmap_init(void)

-- 
Best Regards,
Artem Bityutskiy