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

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

mtd: orion_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 54e07f54

drivers/mtd/nand/orion_nand.c

+1 −13
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
#include <mach/hardware.h>

#include <plat/orion_nand.h>



#ifdef CONFIG_MTD_CMDLINE_PARTS

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

#endif



static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)

{
@@ -83,10 +81,8 @@ static int __init orion_nand_probe(struct platform_device *pdev) 
	struct resource *res;

	void __iomem *io_base;

	int ret = 0;

#ifdef CONFIG_MTD_PARTITIONS

	struct mtd_partition *partitions = NULL;

	int num_part = 0;

#endif



	nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL);

	if (!nc) {
@@ -136,7 +132,6 @@ static int __init orion_nand_probe(struct platform_device *pdev) 
		goto no_dev;

	}



#ifdef CONFIG_MTD_PARTITIONS

#ifdef CONFIG_MTD_CMDLINE_PARTS

	mtd->name = "orion_nand";

	num_part = parse_mtd_partitions(mtd, part_probes, &partitions, 0);
@@ -147,14 +142,7 @@ static int __init orion_nand_probe(struct platform_device *pdev) 
		partitions = board->parts;

	}



	if (partitions && num_part > 0)

		ret = add_mtd_partitions(mtd, partitions, num_part);

	else

		ret = add_mtd_device(mtd);

#else

	ret = add_mtd_device(mtd);

#endif



	ret = mtd_device_register(mtd, partitions, num_part);

	if (ret) {

		nand_release(mtd);

		goto no_dev;