renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 08:44:14 +08:00
Code

mtd: atmel_nand don't specify default parsing options

Browse Source 
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>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-05-29 20:16:48 +04:00 committed by Artem Bityutskiy
parent 2ef3855a91
commit 2108c3bc63
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mtd/nand/atmel_nand.c
View File

@ -481,10 +481,6 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
}
}
#ifdef CONFIG_MTD_CMDLINE_PARTS
static const char *part_probes[] = { "cmdlinepart", NULL };
#endif
/*
* Probe for the NAND device.
*/
@ -655,11 +651,8 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
goto err_scan_tail;
}
#ifdef CONFIG_MTD_CMDLINE_PARTS
mtd->name = "atmel_nand";
num_partitions = parse_mtd_partitions(mtd, part_probes,
&partitions, 0);
#endif
num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, 0);
if (num_partitions <= 0 && host->board->parts) {
partitions = host->board->parts;
num_partitions = host->board->num_parts;