aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/sharpsl.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 12:17:08 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:03 -0400
commita4c93614fded8ef0be90fca6a619d3c9c3e9552f (patch)
tree427517e73165575b883663f4f8f928192787d7b3 /drivers/mtd/nand/sharpsl.c
parent5b2efbdf70c74dcab575103c547ae27a71daba4c (diff)
mtd: sharpsl 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>
Diffstat (limited to 'drivers/mtd/nand/sharpsl.c')
-rw-r--r--drivers/mtd/nand/sharpsl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 19e24ed089ea..b3377f88326e 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -103,8 +103,6 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat,
103 return readb(sharpsl->io + ECCCNTR) != 0; 103 return readb(sharpsl->io + ECCCNTR) != 0;
104} 104}
105 105
106static const char *part_probes[] = { "cmdlinepart", NULL };
107
108/* 106/*
109 * Main initialization routine 107 * Main initialization routine
110 */ 108 */
@@ -184,7 +182,7 @@ static int __devinit sharpsl_nand_probe(struct platform_device *pdev)
184 182
185 /* Register the partitions */ 183 /* Register the partitions */
186 sharpsl->mtd.name = "sharpsl-nand"; 184 sharpsl->mtd.name = "sharpsl-nand";
187 nr_partitions = parse_mtd_partitions(&sharpsl->mtd, part_probes, &sharpsl_partition_info, 0); 185 nr_partitions = parse_mtd_partitions(&sharpsl->mtd, NULL, &sharpsl_partition_info, 0);
188 if (nr_partitions <= 0) { 186 if (nr_partitions <= 0) {
189 nr_partitions = data->nr_partitions; 187 nr_partitions = data->nr_partitions;
190 sharpsl_partition_info = data->partitions; 188 sharpsl_partition_info = data->partitions;