openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: cmx270_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>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-05-29 20:16:52 +04:00 committed by Artem Bityutskiy
parent caf32f4e8c
commit 00205e8313
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/nand/cmx270_nand.c
View File

@ -50,8 +50,6 @@ static struct mtd_partition partition_info[] = {
}; };
#define NUM_PARTITIONS (ARRAY_SIZE(partition_info)) #define NUM_PARTITIONS (ARRAY_SIZE(partition_info))
const char *part_probes[] = { "cmdlinepart", NULL };
static u_char cmx270_read_byte(struct mtd_info *mtd) static u_char cmx270_read_byte(struct mtd_info *mtd)
{ {
struct nand_chip *this = mtd->priv; struct nand_chip *this = mtd->priv;
@ -222,14 +220,13 @@ static int __init cmx270_init(void)
goto err_scan; goto err_scan;
} }
#ifdef CONFIG_MTD_CMDLINE_PARTS mtd_parts_nb = parse_mtd_partitions(cmx270_nand_mtd, NULL,
mtd_parts_nb = parse_mtd_partitions(cmx270_nand_mtd, part_probes,
&mtd_parts, 0); &mtd_parts, 0);
if (mtd_parts_nb > 0) if (mtd_parts_nb > 0)
part_type = "command line"; part_type = "command line";
else else
mtd_parts_nb = 0; mtd_parts_nb = 0;
#endif
if (!mtd_parts_nb) { if (!mtd_parts_nb) {
mtd_parts = partition_info; mtd_parts = partition_info;
mtd_parts_nb = NUM_PARTITIONS; mtd_parts_nb = NUM_PARTITIONS;