mtd: spi-nor: drop unnecessary partition parser data

Now that the SPI-NOR/MTD framework pass the 'flash_node' through to the
partition parsing code, we don't have to do it ourselves.

Also convert to mtd_device_register(), since we don't need the 2nd and
3rd parameters anymore.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 556b4554007f3daf3f012d3e655c0756e5710ea5..6dbf7832e77a3d76a863b77086d888520242dca6 100644 (file)
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -175,7 +175,6 @@ static int m25p80_erase(struct spi_nor *nor, loff_t offset)
  */
 static int m25p_probe(struct spi_device *spi)
 {
-       struct mtd_part_parser_data     ppdata;
        struct flash_platform_data      *data;
        struct m25p *flash;
        struct spi_nor *nor;
@@ -227,11 +226,8 @@ static int m25p_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       ppdata.of_node = spi->dev.of_node;
-
-       return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
-                       data ? data->parts : NULL,
-                       data ? data->nr_parts : 0);
+       return mtd_device_register(&nor->mtd, data ? data->parts : NULL,
+                                  data ? data->nr_parts : 0);
 }
 
 

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 8f4d9204d2b2ce236f9db6222dce41e6a70c20d8..9e7f657af6a56818bb22fc267d0c44effe187aeb 100644 (file)
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -927,7 +927,6 @@ static void fsl_qspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops)
 static int fsl_qspi_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       struct mtd_part_parser_data ppdata;
        struct device *dev = &pdev->dev;
        struct fsl_qspi *q;
        struct resource *res;
@@ -1038,8 +1037,7 @@ static int fsl_qspi_probe(struct platform_device *pdev)
                if (ret)
                        goto mutex_failed;
 
-               ppdata.of_node = np;
-               ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
+               ret = mtd_device_register(mtd, NULL, 0);
                if (ret)
                        goto mutex_failed;
 

diff --git a/drivers/mtd/spi-nor/nxp-spifi.c b/drivers/mtd/spi-nor/nxp-spifi.c
index 4524b28869464690ebeac02e30c1a92f2880c816..ae428cb0e04bb7077674adfa961d83c211501618 100644 (file)
--- a/drivers/mtd/spi-nor/nxp-spifi.c
+++ b/drivers/mtd/spi-nor/nxp-spifi.c
@@ -271,7 +271,6 @@ static void nxp_spifi_dummy_id_read(struct spi_nor *nor)
 static int nxp_spifi_setup_flash(struct nxp_spifi *spifi,
                                 struct device_node *np)
 {
-       struct mtd_part_parser_data ppdata;
        enum read_mode flash_read;
        u32 ctrl, property;
        u16 mode = 0;
@@ -361,8 +360,7 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi,
                return ret;
        }
 
-       ppdata.of_node = np;
-       ret = mtd_device_parse_register(&spifi->nor.mtd, NULL, &ppdata, NULL, 0);
+       ret = mtd_device_register(&spifi->nor.mtd, NULL, 0);
        if (ret) {
                dev_err(spifi->dev, "mtd device parse failed\n");
                return ret;