mtd: ndfc: 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>

diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 7ba65553d6ad3891e30a7e61f2aa352c75095eeb..ea2dea8a9c88b6f72e8b59fcd724b085617abfca 100644 (file)
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -42,9 +42,7 @@ struct ndfc_controller {
        struct nand_chip chip;
        int chip_select;
        struct nand_hw_control ndfc_control;
        struct nand_chip chip;
        int chip_select;
        struct nand_hw_control ndfc_control;

-#ifdef CONFIG_MTD_PARTITIONS

        struct mtd_partition *parts;
        struct mtd_partition *parts;

-#endif

 };
 
 static struct ndfc_controller ndfc_ctrl[NDFC_MAX_CS];
 };
 
 static struct ndfc_controller ndfc_ctrl[NDFC_MAX_CS];


@@ -161,12 +159,10 @@ static int ndfc_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 static int ndfc_chip_init(struct ndfc_controller *ndfc,
                          struct device_node *node)
 {
 static int ndfc_chip_init(struct ndfc_controller *ndfc,
                          struct device_node *node)
 {

-#ifdef CONFIG_MTD_PARTITIONS

 #ifdef CONFIG_MTD_CMDLINE_PARTS
        static const char *part_types[] = { "cmdlinepart", NULL };
 #else
        static const char *part_types[] = { NULL };
 #ifdef CONFIG_MTD_CMDLINE_PARTS
        static const char *part_types[] = { "cmdlinepart", NULL };
 #else
        static const char *part_types[] = { NULL };

-#endif

 #endif
        struct device_node *flash_np;
        struct nand_chip *chip = &ndfc->chip;
 #endif
        struct device_node *flash_np;
        struct nand_chip *chip = &ndfc->chip;


@@ -208,25 +204,18 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
        if (ret)
                goto err;
 
        if (ret)
                goto err;
 

-#ifdef CONFIG_MTD_PARTITIONS

        ret = parse_mtd_partitions(&ndfc->mtd, part_types, &ndfc->parts, 0);
        if (ret < 0)
                goto err;
 
        ret = parse_mtd_partitions(&ndfc->mtd, part_types, &ndfc->parts, 0);
        if (ret < 0)
                goto err;
 

-#ifdef CONFIG_MTD_OF_PARTS

        if (ret == 0) {
                ret = of_mtd_parse_partitions(&ndfc->ofdev->dev, flash_np,
                                              &ndfc->parts);
                if (ret < 0)
                        goto err;
        }
        if (ret == 0) {
                ret = of_mtd_parse_partitions(&ndfc->ofdev->dev, flash_np,
                                              &ndfc->parts);
                if (ret < 0)
                        goto err;
        }

-#endif

 
 

-       if (ret > 0)
-               ret = add_mtd_partitions(&ndfc->mtd, ndfc->parts, ret);
-       else
-#endif
-               ret = add_mtd_device(&ndfc->mtd);
+       ret = mtd_device_register(&ndfc->mtd, ndfc->parts, ret);

 
 err:
        of_node_put(flash_np);
 
 err:
        of_node_put(flash_np);