summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:16:49 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:00 +0300
commitcaf32f4e8ca84ed1b0570176770f7209e7c304fe (patch)
tree10179b77f212f8474bbb15da11368434ba8ac120
parent2108c3bc632962422b7929e715ed6bbb837ac25c (diff)
downloadop-kernel-dev-caf32f4e8ca84ed1b0570176770f7209e7c304fe.zip
op-kernel-dev-caf32f4e8ca84ed1b0570176770f7209e7c304fe.tar.gz
mtd: bcm_umi_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. Artem: tweaked the patch Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/nand/bcm_umi_nand.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c
index e3ffc4c..b1b7b16 100644
--- a/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@ -52,8 +52,6 @@
static const __devinitconst char gBanner[] = KERN_INFO \
"BCM UMI MTD NAND Driver: 1.00\n";
-const char *part_probes[] = { "cmdlinepart", NULL };
-
#if NAND_ECC_BCH
static uint8_t scan_ff_pattern[] = { 0xff };
@@ -496,9 +494,8 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
struct mtd_partition *partition_info;
board_mtd->name = "bcm_umi-nand";
- nr_partitions =
- parse_mtd_partitions(board_mtd, part_probes,
- &partition_info, 0);
+ nr_partitions = parse_mtd_partitions(board_mtd, NULL,
+ &partition_info, 0);
if (nr_partitions <= 0) {
printk(KERN_ERR "BCM UMI NAND: Too few partitions - %d\n",
OpenPOWER on IntegriCloud