Commit f397d8c0 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Artem Bityutskiy
Browse files

mtd: omap2 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 2aedf3e9

drivers/mtd/nand/omap2.c

+1 −3
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ 
#define P4e_s(a)	(TF(a & NAND_Ecc_P4e)		<< 0)

#define P4o_s(a)	(TF(a & NAND_Ecc_P4o)		<< 1)



static const char *part_probes[] = { "cmdlinepart", NULL };



/* oob info generated runtime depending on ecc algorithm and layout selected */

static struct nand_ecclayout omap_oobinfo;

/* Define some generic bad / good block scan pattern which are used
@@ -1103,7 +1101,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) 
		goto out_release_mem_region;

	}



	err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);

	err = parse_mtd_partitions(&info->mtd, NULL, &info->parts, 0);

	if (err > 0)

		mtd_device_register(&info->mtd, info->parts, err);

	else if (pdata->parts)