diff options
| author | Jamie Iles | 2011-05-23 11:23:15 +0200 |
|---|---|---|
| committer | David Woodhouse | 2011-05-25 03:23:15 +0200 |
| commit | 88146872f0fbd89e425e3e0db71d42df8db9d932 (patch) | |
| tree | a6b6b9cc6d781f07403620648eff4d8f7329032c /drivers/mtd/nand/bf5xx_nand.c | |
| parent | mtd: bcm_umi_nand: convert to mtd_device_register() (diff) | |
| download | kernel-qcow2-linux-88146872f0fbd89e425e3e0db71d42df8db9d932.tar.gz kernel-qcow2-linux-88146872f0fbd89e425e3e0db71d42df8db9d932.tar.xz kernel-qcow2-linux-88146872f0fbd89e425e3e0db71d42df8db9d932.zip | |
mtd: bf5xx_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: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/bf5xx_nand.c')
| -rw-r--r-- | drivers/mtd/nand/bf5xx_nand.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c index 79947bea4d57..dd899cb5d366 100644 --- a/drivers/mtd/nand/bf5xx_nand.c +++ b/drivers/mtd/nand/bf5xx_nand.c @@ -659,15 +659,10 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info) static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info) { struct mtd_info *mtd = &info->mtd; - -#ifdef CONFIG_MTD_PARTITIONS struct mtd_partition *parts = info->platform->partitions; int nr = info->platform->nr_partitions; - return add_mtd_partitions(mtd, parts, nr); -#else - return add_mtd_device(mtd); -#endif + return mtd_device_register(mtd, parts, nr); } static int __devexit bf5xx_nand_remove(struct platform_device *pdev) |