diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 12:17:00 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:02 -0400 |
commit | bef06150b2c0607edbee8e8c5fd7e882a90a976a (patch) | |
tree | aa3cf539630aff9164c101f9e478a5a40200bc91 | |
parent | e411f52d591fff47a251a213e1f4115dfb356e8d (diff) |
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>
-rw-r--r-- | drivers/mtd/nand/jz4740_nand.c | 9 |
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, | |||
251 | return 0; | 251 | return 0; |
252 | } | 252 | } |
253 | 253 | ||
254 | #ifdef CONFIG_MTD_CMDLINE_PARTS | ||
255 | static const char *part_probes[] = {"cmdline", NULL}; | ||
256 | #endif | ||
257 | |||
258 | static int jz_nand_ioremap_resource(struct platform_device *pdev, | 254 | static int jz_nand_ioremap_resource(struct platform_device *pdev, |
259 | const char *name, struct resource **res, void __iomem **base) | 255 | const char *name, struct resource **res, void __iomem **base) |
260 | { | 256 | { |
@@ -373,10 +369,7 @@ static int __devinit jz_nand_probe(struct platform_device *pdev) | |||
373 | goto err_gpio_free; | 369 | goto err_gpio_free; |
374 | } | 370 | } |
375 | 371 | ||
376 | #ifdef CONFIG_MTD_CMDLINE_PARTS | 372 | num_partitions = parse_mtd_partitions(mtd, NULL, &partition_info, 0); |
377 | num_partitions = parse_mtd_partitions(mtd, part_probes, | ||
378 | &partition_info, 0); | ||
379 | #endif | ||
380 | if (num_partitions <= 0 && pdata) { | 373 | if (num_partitions <= 0 && pdata) { |
381 | num_partitions = pdata->num_partitions; | 374 | num_partitions = pdata->num_partitions; |
382 | partition_info = pdata->partitions; | 375 | partition_info = pdata->partitions; |