openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jamie Iles 2011-05-23 10:23:15 +01:00 committed by David Woodhouse
parent 63c9dd9257
commit 88146872f0
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/nand/bf5xx_nand.c
View File

@ -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) static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info)
{ {
struct mtd_info *mtd = &info->mtd; struct mtd_info *mtd = &info->mtd;
#ifdef CONFIG_MTD_PARTITIONS
struct mtd_partition *parts = info->platform->partitions; struct mtd_partition *parts = info->platform->partitions;
int nr = info->platform->nr_partitions; int nr = info->platform->nr_partitions;
return add_mtd_partitions(mtd, parts, nr); return mtd_device_register(mtd, parts, nr);
#else
return add_mtd_device(mtd);
#endif
} }
static int __devexit bf5xx_nand_remove(struct platform_device *pdev) static int __devexit bf5xx_nand_remove(struct platform_device *pdev)