mtd: s3c2410 nand: convert to mtd_device_register()

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

Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
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>

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index cea775aa9482e0905f72cef1c0162227d8bd5fb6..4405468f196b076c6b97fb1366ec8fff55d684a8 100644 (file)
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -744,7 +744,6 @@ static int s3c24xx_nand_remove(struct platform_device *pdev)
        return 0;
 }
 
        return 0;
 }
 

-#ifdef CONFIG_MTD_PARTITIONS

 const char *part_probes[] = { "cmdlinepart", NULL };
 static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
                                      struct s3c2410_nand_mtd *mtd,
 const char *part_probes[] = { "cmdlinepart", NULL };
 static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
                                      struct s3c2410_nand_mtd *mtd,


@@ -754,7 +753,7 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
        int nr_part = 0;
 
        if (set == NULL)
        int nr_part = 0;
 
        if (set == NULL)

-               return add_mtd_device(&mtd->mtd);
+               return mtd_device_register(&mtd->mtd, NULL, 0);

 
        mtd->mtd.name = set->name;
        nr_part = parse_mtd_partitions(&mtd->mtd, part_probes, &part_info, 0);
 
        mtd->mtd.name = set->name;
        nr_part = parse_mtd_partitions(&mtd->mtd, part_probes, &part_info, 0);


@@ -764,19 +763,8 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
                part_info = set->partitions;
        }
 
                part_info = set->partitions;
        }
 

-       if (nr_part > 0 && part_info)
-               return add_mtd_partitions(&mtd->mtd, part_info, nr_part);
-
-       return add_mtd_device(&mtd->mtd);
-}
-#else
-static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
-                                     struct s3c2410_nand_mtd *mtd,
-                                     struct s3c2410_nand_set *set)
-{
-       return add_mtd_device(&mtd->mtd);
+       return mtd_device_register(&mtd->mtd, part_info, nr_part);

 }
 }

-#endif

 
 /**
  * s3c2410_nand_init_chip - initialise a single instance of an chip
 
 /**
  * s3c2410_nand_init_chip - initialise a single instance of an chip