Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6232b42 authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse
Browse files

mtd: atmel_nand: convert to mtd_device_register() 



Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 5e7e9686

drivers/mtd/nand/atmel_nand.c

+1 −11
Original line number Diff line number Diff line
@@ -495,11 +495,8 @@ static int __init atmel_nand_probe(struct platform_device *pdev) 
	struct resource *regs;

	struct resource *mem;

	int res;



#ifdef CONFIG_MTD_PARTITIONS

	struct mtd_partition *partitions = NULL;

	int num_partitions = 0;

#endif



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!mem) {
@@ -657,7 +654,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev) 
		goto err_scan_tail;

	}



#ifdef CONFIG_MTD_PARTITIONS

#ifdef CONFIG_MTD_CMDLINE_PARTS

	mtd->name = "atmel_nand";

	num_partitions = parse_mtd_partitions(mtd, part_probes,
@@ -673,17 +669,11 @@ static int __init atmel_nand_probe(struct platform_device *pdev) 
		goto err_no_partitions;

	}



	res = add_mtd_partitions(mtd, partitions, num_partitions);

#else

	res = add_mtd_device(mtd);

#endif



	res = mtd_device_register(mtd, partitions, num_partitions);

	if (!res)

		return res;



#ifdef CONFIG_MTD_PARTITIONS

err_no_partitions:

#endif

	nand_release(mtd);

err_scan_tail:

err_scan_ident: