[PATCH 4/5] mtd: drop unnecessary partition parser data

[Brian Norris]

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 
---
 drivers/mtd/devices/mtd_dataflash.c | 5 ++---
 drivers/mtd/devices/spear_smi.c | 6 ++
 drivers/mtd/devices/st_spi_fsm.c| 5 ++---
 drivers/mtd/maps/lantiq-flash.c | 5 ++---
 drivers/mtd/maps/physmap_of.c   | 5 ++---
 drivers/mtd/onenand/omap2.c | 8 +++-
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/drivers/mtd/devices/mtd_dataflash.c 
b/drivers/mtd/devices/mtd_dataflash.c
index 39666d552682..0de40f5a7509 100644
--- 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(>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 = >dev;
+   device->dev.of_node = 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, ,
+   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 64c7458344d4..8c41cc82d860 100644
--- 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 = >dev;
+   flash->mtd.dev.of_node = 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(>mtd, NULL, , parts,
-   count);
+   ret = mtd_device_register(>mtd, parts, count);
if (ret) {
dev_err(>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 3060025c8af4..16cd44f728c1 100644
--- 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(>dev, "No DT found\n");
return -EINVAL;
}
-   ppdata.of_node = np;
 
fsm = devm_kzalloc(>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 = >dev;
+   fsm->mtd.dev.of_node= 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(>mtd, NULL, , NULL, 0);
+   return mtd_device_register(>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

[PATCH 4/5] mtd: drop unnecessary partition parser data

[Brian Norris]

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 
---
 drivers/mtd/devices/mtd_dataflash.c | 5 ++---
 drivers/mtd/devices/spear_smi.c | 6 ++
 drivers/mtd/devices/st_spi_fsm.c| 5 ++---
 drivers/mtd/maps/lantiq-flash.c | 5 ++---
 drivers/mtd/maps/physmap_of.c   | 5 ++---
 drivers/mtd/onenand/omap2.c | 8 +++-
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/drivers/mtd/devices/mtd_dataflash.c 
b/drivers/mtd/devices/mtd_dataflash.c
index 39666d552682..0de40f5a7509 100644
--- 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(>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 = >dev;
+   device->dev.of_node = 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, ,
+   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 64c7458344d4..8c41cc82d860 100644
--- 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 = >dev;
+   flash->mtd.dev.of_node = 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(>mtd, NULL, , parts,
-   count);
+   ret = mtd_device_register(>mtd, parts, count);
if (ret) {
dev_err(>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 3060025c8af4..16cd44f728c1 100644
--- 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(>dev, "No DT found\n");
return -EINVAL;
}
-   ppdata.of_node = np;
 
fsm = devm_kzalloc(>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 = >dev;
+   fsm->mtd.dev.of_node= 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(>mtd, NULL, , NULL, 0);
+   return mtd_device_register(>mtd, NULL, 0);
 }
 
 static int stfsm_remove(struct platform_device *pdev)
diff --git a/drivers/mtd/maps/lantiq-flash.c