Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 88146872f0fbd89e425e3e0db71d42df8db9d932

Authored by Jamie Iles
Committed by David Woodhouse
1 parent 63c9dd9257
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff

drivers/mtd/nand/bf5xx_nand.c
Diff comments   View file @ 8814687
... ... @@ -659,15 +659,10 @@
659 659 static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info)
660 660 {
661 661 struct mtd_info *mtd = &info->mtd;
662   -
663   -#ifdef CONFIG_MTD_PARTITIONS
664 662 struct mtd_partition *parts = info->platform->partitions;
665 663 int nr = info->platform->nr_partitions;
666 664  
667   - return add_mtd_partitions(mtd, parts, nr);
668   -#else
669   - return add_mtd_device(mtd);
670   -#endif
  665 + return mtd_device_register(mtd, parts, nr);
671 666 }
672 667  
673 668 static int __devexit bf5xx_nand_remove(struct platform_device *pdev)