aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 12:17:07 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:03 -0400
commit5b2efbdf70c74dcab575103c547ae27a71daba4c (patch)
tree89b0af8f8e955f29d82a47b50c2b939a22141dac
parentc842f570a6e3ac002389ab7154084e32f4f5021a (diff)
mtd: s3c2410 don't specify default parsing options
Since 'cmdline, NULL' is now a default for parse_mtd_partitions, don't specify this in every driver, instead pass NULL to force parse_mtd_partitions to use default. 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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index ec280798e221..17954baf12cd 100644
--- 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)
744 return 0; 744 return 0;
745} 745}
746 746
747const char *part_probes[] = { "cmdlinepart", NULL };
748static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info, 747static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
749 struct s3c2410_nand_mtd *mtd, 748 struct s3c2410_nand_mtd *mtd,
750 struct s3c2410_nand_set *set) 749 struct s3c2410_nand_set *set)
@@ -756,7 +755,7 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
756 return mtd_device_register(&mtd->mtd, NULL, 0); 755 return mtd_device_register(&mtd->mtd, NULL, 0);
757 756
758 mtd->mtd.name = set->name; 757 mtd->mtd.name = set->name;
759 nr_part = parse_mtd_partitions(&mtd->mtd, part_probes, &part_info, 0); 758 nr_part = parse_mtd_partitions(&mtd->mtd, NULL, &part_info, 0);
760 759
761 if (nr_part <= 0 && set->nr_partitions > 0) { 760 if (nr_part <= 0 && set->nr_partitions > 0) {
762 nr_part = set->nr_partitions; 761 nr_part = set->nr_partitions;