]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mtd: rawnand: use mtd_device_register() where applicable
authorRafał Miłecki <rafal@milecki.pl>
Fri, 13 Jul 2018 09:27:31 +0000 (11:27 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Thu, 19 Jul 2018 21:14:12 +0000 (23:14 +0200)
If driver doesn't specify parsers it can use that little helper.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Xiaolei Li <xiaolei.li@mediatek.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
drivers/mtd/nand/raw/cmx270_nand.c
drivers/mtd/nand/raw/cs553x_nand.c
drivers/mtd/nand/raw/davinci_nand.c
drivers/mtd/nand/raw/jz4740_nand.c
drivers/mtd/nand/raw/mtk_nand.c
drivers/mtd/nand/raw/s3c2410.c
drivers/mtd/nand/raw/txx9ndfmc.c

index 02d6751e9efea6ea8cfcf650a6e2c748b87a43a0..b66e254b680281b4b951866ad9492473f8544f3d 100644 (file)
@@ -200,8 +200,8 @@ static int __init cmx270_init(void)
        }
 
        /* Register the partitions */
-       ret = mtd_device_parse_register(cmx270_nand_mtd, NULL, NULL,
-                                       partition_info, NUM_PARTITIONS);
+       ret = mtd_device_register(cmx270_nand_mtd, partition_info,
+                                 NUM_PARTITIONS);
        if (ret)
                goto err_scan;
 
index 82269fde9e6623b0a4433083cfd1d4a7fcd5cc67..beafad62e7d5007f4a2313cf1dd469b0fabf88f1 100644 (file)
@@ -310,8 +310,7 @@ static int __init cs553x_init(void)
        for (i = 0; i < NR_CS553X_CONTROLLERS; i++) {
                if (cs553x_mtd[i]) {
                        /* If any devices registered, return success. Else the last error. */
-                       mtd_device_parse_register(cs553x_mtd[i], NULL, NULL,
-                                                 NULL, 0);
+                       mtd_device_register(cs553x_mtd[i], NULL, 0);
                        err = 0;
                }
        }
index e79ed0f60ade93a45ec21fd179b9b7ab01ee02ce..626c9363e4602249da798a18237e97132f0c9480 100644 (file)
@@ -800,8 +800,7 @@ static int nand_davinci_probe(struct platform_device *pdev)
                goto err;
 
        if (pdata->parts)
-               ret = mtd_device_parse_register(mtd, NULL, NULL,
-                                       pdata->parts, pdata->nr_parts);
+               ret = mtd_device_register(mtd, pdata->parts, pdata->nr_parts);
        else
                ret = mtd_device_register(mtd, NULL, 0);
        if (ret < 0)
index c5dea83b9ea02f2fbb074f90929f9338cb2511a1..9bb8a89e09f9be2cdded882d8d28d9b1edf8711a 100644 (file)
@@ -466,9 +466,8 @@ static int jz_nand_probe(struct platform_device *pdev)
                goto err_unclaim_banks;
        }
 
-       ret = mtd_device_parse_register(mtd, NULL, NULL,
-                                       pdata ? pdata->partitions : NULL,
-                                       pdata ? pdata->num_partitions : 0);
+       ret = mtd_device_register(mtd, pdata ? pdata->partitions : NULL,
+                                 pdata ? pdata->num_partitions : 0);
 
        if (ret) {
                dev_err(&pdev->dev, "Failed to add mtd device\n");
index 75c845adb05016013e69789ee6bbd74a98d0d55b..e6b14b79c8a829c401e05445a5459ca6a932dbcc 100644 (file)
@@ -1357,7 +1357,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc,
        if (ret)
                return ret;
 
-       ret = mtd_device_parse_register(mtd, NULL, NULL, NULL, 0);
+       ret = mtd_device_register(mtd, NULL, 0);
        if (ret) {
                dev_err(dev, "mtd parse partition error\n");
                nand_release(mtd);
index 19661c5d3220a4533794a1906388dc38a8a919ca..10d81f367d26f65d0df6e5ab1765eb6ded603a0c 100644 (file)
@@ -802,8 +802,8 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
 
                mtdinfo->name = set->name;
 
-               return mtd_device_parse_register(mtdinfo, NULL, NULL,
-                                        set->partitions, set->nr_partitions);
+               return mtd_device_register(mtdinfo, set->partitions,
+                                          set->nr_partitions);
        }
 
        return -ENODEV;
index 04d57474ef9738bea160ed31ed5acb9ad858e3c4..5fe9da8b4a0afcad7a2333d561220d5449a15f77 100644 (file)
@@ -366,7 +366,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
                }
                mtd->name = txx9_priv->mtdname;
 
-               mtd_device_parse_register(mtd, NULL, NULL, NULL, 0);
+               mtd_device_register(mtd, NULL, 0);
                drvdata->mtds[i] = mtd;
        }