aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-06-02 10:01:02 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:09 -0400
commit599501a749a1ca3baa94ac9714f06782f63439b0 (patch)
tree409c993429b857935fe90cc09063bb5c8c5c5773
parentee0f6a15b3f9246ae11e581cb9dae8fb2cc5da5c (diff)
mtd: s3c2410.c: use mtd_device_parse_register
Replace custom invocations of parse_mtd_partitions and mtd_device_register with common mtd_device_parse_register call. This would bring: standard handling of all errors, fallback to default partitions, etc. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/nand/s3c2410.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 17954baf12cd..b0f8e77834fe 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -748,21 +748,11 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
748 struct s3c2410_nand_mtd *mtd, 748 struct s3c2410_nand_mtd *mtd,
749 struct s3c2410_nand_set *set) 749 struct s3c2410_nand_set *set)
750{ 750{
751 struct mtd_partition *part_info; 751 if (set)
752 int nr_part = 0; 752 mtd->mtd.name = set->name;
753 753
754 if (set == NULL) 754 return mtd_device_parse_register(&mtd->mtd, NULL, 0,
755 return mtd_device_register(&mtd->mtd, NULL, 0); 755 set->partitions, set->nr_partitions);
756
757 mtd->mtd.name = set->name;
758 nr_part = parse_mtd_partitions(&mtd->mtd, NULL, &part_info, 0);
759
760 if (nr_part <= 0 && set->nr_partitions > 0) {
761 nr_part = set->nr_partitions;
762 part_info = set->partitions;
763 }
764
765 return mtd_device_register(&mtd->mtd, part_info, nr_part);
766} 756}
767 757
768/** 758/**