Commit 8d3f8bb8 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Artem Bityutskiy

mtd: fsmc_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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent a8e08324
......@@ -177,9 +177,6 @@ static struct mtd_partition partition_info_128KB_blk[] = {
},
};
#ifdef CONFIG_MTD_CMDLINE_PARTS
const char *part_probes[] = { "cmdlinepart", NULL };
#endif
/**
* struct fsmc_nand_data - structure for FSMC NAND device state
......@@ -716,15 +713,13 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
* platform data,
* default partition information present in driver.
*/
#ifdef CONFIG_MTD_CMDLINE_PARTS
/*
* Check if partition info passed via command line
* Check for partition info passed
*/
host->mtd.name = "nand";
host->nr_partitions = parse_mtd_partitions(&host->mtd, part_probes,
host->nr_partitions = parse_mtd_partitions(&host->mtd, NULL,
&host->partitions, 0);
if (host->nr_partitions <= 0) {
#endif
/*
* Check if partition info passed via command line
*/
......@@ -769,9 +764,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
}
}
}
#ifdef CONFIG_MTD_CMDLINE_PARTS
}
#endif
ret = mtd_device_register(&host->mtd, host->partitions,
host->nr_partitions);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment