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

diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index cea38a5d4ac52ba51eba9b550be9fcc5e20604ef..6e813daed068d359f66f3c2ffb65abf46d924a44 100644 (file)
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -299,10 +299,8 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
        struct nand_chip *chip;
        struct mtd_info *mtd;
        struct jz_nand_platform_data *pdata = pdev->dev.platform_data;
        struct nand_chip *chip;
        struct mtd_info *mtd;
        struct jz_nand_platform_data *pdata = pdev->dev.platform_data;

-#ifdef CONFIG_MTD_PARTITIONS

        struct mtd_partition *partition_info;
        int num_partitions = 0;
        struct mtd_partition *partition_info;
        int num_partitions = 0;

-#endif

 
        nand = kzalloc(sizeof(*nand), GFP_KERNEL);
        if (!nand) {
 
        nand = kzalloc(sizeof(*nand), GFP_KERNEL);
        if (!nand) {


@@ -375,7 +373,6 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
                goto err_gpio_free;
        }
 
                goto err_gpio_free;
        }
 

-#ifdef CONFIG_MTD_PARTITIONS

 #ifdef CONFIG_MTD_CMDLINE_PARTS
        num_partitions = parse_mtd_partitions(mtd, part_probes,
                                                &partition_info, 0);
 #ifdef CONFIG_MTD_CMDLINE_PARTS
        num_partitions = parse_mtd_partitions(mtd, part_probes,
                                                &partition_info, 0);


@@ -384,12 +381,7 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
                num_partitions = pdata->num_partitions;
                partition_info = pdata->partitions;
        }
                num_partitions = pdata->num_partitions;
                partition_info = pdata->partitions;
        }

-
-       if (num_partitions > 0)
-               ret = add_mtd_partitions(mtd, partition_info, num_partitions);
-       else
-#endif
-       ret = add_mtd_device(mtd);
+       ret = mtd_device_register(mtd, partition_info, num_partitions);

 
        if (ret) {
                dev_err(&pdev->dev, "Failed to add mtd device\n");
 
        if (ret) {
                dev_err(&pdev->dev, "Failed to add mtd device\n");