summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/jz4740_nand.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:17:00 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:02 +0300
commitbef06150b2c0607edbee8e8c5fd7e882a90a976a (patch)
treeaa3cf539630aff9164c101f9e478a5a40200bc91 /drivers/mtd/nand/jz4740_nand.c
parente411f52d591fff47a251a213e1f4115dfb356e8d (diff)
downloadlinux-bef06150b2c0607edbee8e8c5fd7e882a90a976a.tar.bz2
mtd: jz4740_nand 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/jz4740_nand.c')
-rw-r--r--drivers/mtd/nand/jz4740_nand.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 6e813daed068..920719cbdb55 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -251,10 +251,6 @@ static int jz_nand_correct_ecc_rs(struct mtd_info *mtd, uint8_t *dat,
return 0;
}
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-static const char *part_probes[] = {"cmdline", NULL};
-#endif
-
static int jz_nand_ioremap_resource(struct platform_device *pdev,
const char *name, struct resource **res, void __iomem **base)
{
@@ -373,10 +369,7 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
goto err_gpio_free;
}
-#ifdef CONFIG_MTD_CMDLINE_PARTS
- num_partitions = parse_mtd_partitions(mtd, part_probes,
- &partition_info, 0);
-#endif
+ num_partitions = parse_mtd_partitions(mtd, NULL, &partition_info, 0);
if (num_partitions <= 0 && pdata) {
num_partitions = pdata->num_partitions;
partition_info = pdata->partitions;