mtd: ATMEL, AVR32: inline nand partition table access

Currently atmel_nand driver used by AT91 and AVR32 calls a special callback
which return nand partition table and number of partitions. However in all
boards this callback returns just static data. So drop this callback and
make atmel_nand use partition table provided statically via platform_data.

Nicolas Ferre: I am in favor for a mainline inclusion through linux-mtd tree.
Hans-Christian Egtvedt: I'm fine by sending the changes for AVR32 through linux-mtd

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

3 files changed, 6 insertions, 14 deletions

diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index fafed4c38fd2..1f17bde52cd4 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -90,11 +90,6 @@ static struct mtd_partition nand_partitions[] = {
         },
 };
 
-static struct mtd_partition *nand_part_info(int size, int *num_partitions)
-{
-        *num_partitions = ARRAY_SIZE(nand_partitions);
-        return nand_partitions;
-}
 
 static struct atmel_nand_data atngw100mkii_nand_data __initdata = {
         .cle            = 21,
@@ -102,7 +97,8 @@ static struct atmel_nand_data atngw100mkii_nand_data __initdata = {
         .rdy_pin        = GPIO_PIN_PB(28),
         .enable_pin     = GPIO_PIN_PE(23),
         .bus_width_16   = true,
-        .partition_info = nand_part_info,
+        .parts          = nand_partitions,
+        .num_parts      = ARRAY_SIZE(nand_partitions),
 };
 #endif
 
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 6ce30fb2ec94..4643ff5107c9 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -90,18 +90,13 @@ static struct mtd_partition nand_partitions[] = {
         },
 };
 
-static struct mtd_partition *nand_part_info(int size, int *num_partitions)
-{
-        *num_partitions = ARRAY_SIZE(nand_partitions);
-        return nand_partitions;
-}
-
 static struct atmel_nand_data atstk1006_nand_data __initdata = {
         .cle            = 21,
         .ale            = 22,
         .rdy_pin        = GPIO_PIN_PB(30),
         .enable_pin     = GPIO_PIN_PB(29),
-        .partition_info = nand_part_info,
+        .parts          = nand_partitions,
+        .num_parts      = ARRAY_SIZE(num_partitions),
 };
 #endif
 
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index 679458d9a622..5d7ffca7d69f 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -128,7 +128,8 @@ struct atmel_nand_data {
         u8      ale;            /* address line number connected to ALE */
         u8      cle;            /* address line number connected to CLE */
         u8      bus_width_16;   /* buswidth is 16 bit */
-        struct mtd_partition *(*partition_info)(int size, int *num_partitions);
+        struct mtd_partition *parts;
+        unsigned int    num_parts;
 };
 struct platform_device *
 at32_add_device_nand(unsigned int id, struct atmel_nand_data *data);