mtd: drop unnecessary partition parser data

We should assign the MTD dev.of_node instead of the parser data field.
This gets us the equivalent partition parser behavior with fewer special
fields and parameter passing.

Also convert several of these 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: Marek Vasut <marex@denx.de>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>

diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 39666d552682e9d607025f3d01ba0afd513dd260..0ada3ed6c23fc527a566e0ff7f89089959945e29 100644 (file)
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -624,7 +624,6 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
 {
        struct dataflash                *priv;
        struct mtd_info                 *device;
-       struct mtd_part_parser_data     ppdata;
        struct flash_platform_data      *pdata = dev_get_platdata(&spi->dev);
        char                            *otp_tag = "";
        int                             err = 0;
@@ -656,6 +655,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
        device->priv = priv;
 
        device->dev.parent = &spi->dev;
+       mtd_set_of_node(device, spi->dev.of_node);
 
        if (revision >= 'c')
                otp_tag = otp_setup(device, revision);
@@ -665,8 +665,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
                        pagesize, otp_tag);
        spi_set_drvdata(spi, priv);
 
-       ppdata.of_node = spi->dev.of_node;
-       err = mtd_device_parse_register(device, NULL, &ppdata,
+       err = mtd_device_register(device,
                        pdata ? pdata->parts : NULL,
                        pdata ? pdata->nr_parts : 0);
 

diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 64c7458344d4331e2e03e99034fbb0e051b24528..dd506987653703624c1a37f9d98ce93ff0690113 100644 (file)
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -810,7 +810,6 @@ static int spear_smi_setup_banks(struct platform_device *pdev,
                                 u32 bank, struct device_node *np)
 {
        struct spear_smi *dev = platform_get_drvdata(pdev);
-       struct mtd_part_parser_data ppdata = {};
        struct spear_smi_flash_info *flash_info;
        struct spear_smi_plat_data *pdata;
        struct spear_snor_flash *flash;
@@ -855,6 +854,7 @@ static int spear_smi_setup_banks(struct platform_device *pdev,
                flash->mtd.name = flash_devices[flash_index].name;
 
        flash->mtd.dev.parent = &pdev->dev;
+       mtd_set_of_node(&flash->mtd, np);
        flash->mtd.type = MTD_NORFLASH;
        flash->mtd.writesize = 1;
        flash->mtd.flags = MTD_CAP_NORFLASH;
@@ -881,10 +881,8 @@ static int spear_smi_setup_banks(struct platform_device *pdev,
                count = flash_info->nr_partitions;
        }
 #endif
-       ppdata.of_node = np;
 
-       ret = mtd_device_parse_register(&flash->mtd, NULL, &ppdata, parts,
-                                       count);
+       ret = mtd_device_register(&flash->mtd, parts, count);
        if (ret) {
                dev_err(&dev->pdev->dev, "Err MTD partition=%d\n", ret);
                return ret;

diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
index 3060025c8af47772cd1d9cc50fdcc277de1521ae..5454b411358920f54e79c5f329d749496dcd965d 100644 (file)
--- a/drivers/mtd/devices/st_spi_fsm.c
+++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -2025,7 +2025,6 @@ boot_device_fail:
 static int stfsm_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       struct mtd_part_parser_data ppdata;
        struct flash_info *info;
        struct resource *res;
        struct stfsm *fsm;
@@ -2035,7 +2034,6 @@ static int stfsm_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "No DT found\n");
                return -EINVAL;
        }
-       ppdata.of_node = np;
 
        fsm = devm_kzalloc(&pdev->dev, sizeof(*fsm), GFP_KERNEL);
        if (!fsm)
@@ -2106,6 +2104,7 @@ static int stfsm_probe(struct platform_device *pdev)
 
        fsm->mtd.name           = info->name;
        fsm->mtd.dev.parent     = &pdev->dev;
+       mtd_set_of_node(&fsm->mtd, np);
        fsm->mtd.type           = MTD_NORFLASH;
        fsm->mtd.writesize      = 4;
        fsm->mtd.writebufsize   = fsm->mtd.writesize;
@@ -2124,7 +2123,7 @@ static int stfsm_probe(struct platform_device *pdev)
                (long long)fsm->mtd.size, (long long)(fsm->mtd.size >> 20),
                fsm->mtd.erasesize, (fsm->mtd.erasesize >> 10));
 
-       return mtd_device_parse_register(&fsm->mtd, NULL, &ppdata, NULL, 0);
+       return mtd_device_register(&fsm->mtd, NULL, 0);
 }
 
 static int stfsm_remove(struct platform_device *pdev)

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index 93852054977ea52a52bea1031296184d754e2761..c8febb326fa6695be04bf8bca0daa50083fe5dbb 100644 (file)
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -110,7 +110,6 @@ ltq_copy_to(struct map_info *map, unsigned long to,
 static int
 ltq_mtd_probe(struct platform_device *pdev)
 {
-       struct mtd_part_parser_data ppdata;
        struct ltq_mtd *ltq_mtd;
        struct cfi_private *cfi;
        int err;
@@ -161,13 +160,13 @@ ltq_mtd_probe(struct platform_device *pdev)
        }
 
        ltq_mtd->mtd->dev.parent = &pdev->dev;
+       mtd_set_of_node(ltq_mtd->mtd, pdev->dev.of_node);
 
        cfi = ltq_mtd->map->fldrv_priv;
        cfi->addr_unlock1 ^= 1;
        cfi->addr_unlock2 ^= 1;
 
-       ppdata.of_node = pdev->dev.of_node;
-       err = mtd_device_parse_register(ltq_mtd->mtd, NULL, &ppdata, NULL, 0);
+       err = mtd_device_register(ltq_mtd->mtd, NULL, 0);
        if (err) {
                dev_err(&pdev->dev, "failed to add partitions\n");
                goto err_destroy;

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index e46b4e9836668ed5e434e26bb963c2d87b2b7588..b7826568807553376b77a0bb11adee8eba821e63 100644 (file)
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -166,7 +166,6 @@ static int of_flash_probe(struct platform_device *dev)
        int reg_tuple_size;
        struct mtd_info **mtd_list = NULL;
        resource_size_t res_size;
-       struct mtd_part_parser_data ppdata;
        bool map_indirect;
        const char *mtd_name = NULL;
 
@@ -310,13 +309,13 @@ static int of_flash_probe(struct platform_device *dev)
        if (err)
                goto err_out;
 
-       ppdata.of_node = dp;
+       mtd_set_of_node(info->cmtd, dp);
        part_probe_types = of_get_probes(dp);
        if (!part_probe_types) {
                err = -ENOMEM;
                goto err_out;
        }
-       mtd_device_parse_register(info->cmtd, part_probe_types, &ppdata,
+       mtd_device_parse_register(info->cmtd, part_probe_types, NULL,
                        NULL, 0);
        of_free_probes(part_probe_types);
 

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 3e02856962279485025e5c54f2d2ff4aa05f9f04..0aacf125938be059e4972d9dd154c14e8c1c9486 100644 (file)
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -614,7 +614,6 @@ static int omap2_onenand_probe(struct platform_device *pdev)
        struct onenand_chip *this;
        int r;
        struct resource *res;
-       struct mtd_part_parser_data ppdata = {};
 
        pdata = dev_get_platdata(&pdev->dev);
        if (pdata == NULL) {
@@ -713,6 +712,7 @@ static int omap2_onenand_probe(struct platform_device *pdev)
        c->mtd.priv = &c->onenand;
 
        c->mtd.dev.parent = &pdev->dev;
+       mtd_set_of_node(&c->mtd, pdata->of_node);
 
        this = &c->onenand;
        if (c->dma_channel >= 0) {
@@ -743,10 +743,8 @@ static int omap2_onenand_probe(struct platform_device *pdev)
        if ((r = onenand_scan(&c->mtd, 1)) < 0)
                goto err_release_regulator;
 
-       ppdata.of_node = pdata->of_node;
-       r = mtd_device_parse_register(&c->mtd, NULL, &ppdata,
-                                     pdata ? pdata->parts : NULL,
-                                     pdata ? pdata->nr_parts : 0);
+       r = mtd_device_register(&c->mtd, pdata ? pdata->parts : NULL,
+                               pdata ? pdata->nr_parts : 0);
        if (r)
                goto err_release_onenand;