mtd: sa1100-flash: convert to mtd_device_register()

Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

2 files changed, 7 insertions, 16 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 4cda05d2e93c..d949eee14f14 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -347,7 +347,7 @@ config MTD_CDB89712
 
 config MTD_SA1100
         tristate "CFI Flash device mapped on StrongARM SA11x0"
-        depends on MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS
+        depends on MTD_CFI && ARCH_SA1100
         help
           This enables access to the flash chips on most platforms based on
           the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index da875908ea8e..a9b5e0e5c4c5 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -226,12 +226,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
         int i;
 
         if (info->mtd) {
-                if (info->nr_parts == 0)
-                        del_mtd_device(info->mtd);
-#ifdef CONFIG_MTD_PARTITIONS
-                else
-                        del_mtd_partitions(info->mtd);
-#endif
+                mtd_device_unregister(info->mtd);
                 if (info->mtd != info->subdev[0].mtd)
                         mtd_concat_destroy(info->mtd);
         }
@@ -363,28 +358,24 @@ static int __devinit sa1100_mtd_probe(struct platform_device *pdev)
         /*
          * Partition selection stuff.
          */
-#ifdef CONFIG_MTD_PARTITIONS
         nr_parts = parse_mtd_partitions(info->mtd, part_probes, &parts, 0);
         if (nr_parts > 0) {
                 info->parts = parts;
                 part_type = "dynamic";
-        } else
-#endif
-        {
+        } else {
                 parts = plat->parts;
                 nr_parts = plat->nr_parts;
                 part_type = "static";
         }
 
-        if (nr_parts == 0) {
+        if (nr_parts == 0)
                 printk(KERN_NOTICE "SA1100 flash: no partition info "
                         "available, registering whole flash\n");
-                add_mtd_device(info->mtd);
-        } else {
+        else
                 printk(KERN_NOTICE "SA1100 flash: using %s partition "
                         "definition\n", part_type);
-                add_mtd_partitions(info->mtd, parts, nr_parts);
-        }
+
+        mtd_device_register(info->mtd, parts, nr_parts);
 
         info->nr_parts = nr_parts;