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

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

mtd: bcm_umi_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 e6232b42

drivers/mtd/nand/bcm_umi_nand.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -52,9 +52,7 @@ 
static const __devinitconst char gBanner[] = KERN_INFO \

static const __devinitconst char gBanner[] = KERN_INFO \

	"BCM UMI MTD NAND Driver: 1.00\n";

	"BCM UMI MTD NAND Driver: 1.00\n";





#ifdef CONFIG_MTD_PARTITIONS

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

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

#endif





#if NAND_ECC_BCH

#if NAND_ECC_BCH

static uint8_t scan_ff_pattern[] = { 0xff };

static uint8_t scan_ff_pattern[] = { 0xff };
@@ -509,7 +507,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev) 
			kfree(board_mtd);

			kfree(board_mtd);

			return -EIO;

			return -EIO;

		}

		}

		add_mtd_partitions(board_mtd, partition_info, nr_partitions);

		mtd_device_register(board_mtd, partition_info, nr_partitions);

	}

	}





	/* Return happy */

	/* Return happy */