| Message ID | 20170331114016.26858-3-zajec5@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Boris Brezillon |
| Headers | show |
On Fri, 31 Mar 2017 13:40:16 +0200 Rafał Miłecki <zajec5@gmail.com> wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > Now support for linux,part-probe has been added to the MTD core there is > no need to duplicate support for it in physmap_of. > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > drivers/mtd/maps/physmap_of.c | 46 +------------------------------------------ > 1 file changed, 1 insertion(+), 45 deletions(-) > > diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c > index 14e8909c9955..49dbb7235848 100644 > --- a/drivers/mtd/maps/physmap_of.c > +++ b/drivers/mtd/maps/physmap_of.c > @@ -114,47 +114,9 @@ static struct mtd_info *obsolete_probe(struct platform_device *dev, > static const char * const part_probe_types_def[] = { > "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL }; > > -static const char * const *of_get_probes(struct device_node *dp) > -{ > - const char *cp; > - int cplen; > - unsigned int l; > - unsigned int count; > - const char **res; > - > - cp = of_get_property(dp, "linux,part-probe", &cplen); > - if (cp == NULL) > - return part_probe_types_def; > - > - count = 0; > - for (l = 0; l != cplen; l++) > - if (cp[l] == 0) > - count++; > - > - res = kzalloc((count + 1)*sizeof(*res), GFP_KERNEL); > - if (!res) > - return NULL; > - count = 0; > - while (cplen > 0) { > - res[count] = cp; > - l = strlen(cp) + 1; > - cp += l; > - cplen -= l; > - count++; > - } > - return res; > -} > - > -static void of_free_probes(const char * const *probes) > -{ > - if (probes != part_probe_types_def) > - kfree(probes); > -} > - > static const struct of_device_id of_flash_match[]; > static int of_flash_probe(struct platform_device *dev) > { > - const char * const *part_probe_types; > const struct of_device_id *match; > struct device_node *dp = dev->dev.of_node; > struct resource res; > @@ -320,14 +282,8 @@ static int of_flash_probe(struct platform_device *dev) > > info->cmtd->dev.parent = &dev->dev; > 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, NULL, > + mtd_device_parse_register(info->cmtd, part_probe_types_def, NULL, > NULL, 0); > - of_free_probes(part_probe_types); > > kfree(mtd_list); >
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 14e8909c9955..49dbb7235848 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c @@ -114,47 +114,9 @@ static struct mtd_info *obsolete_probe(struct platform_device *dev, static const char * const part_probe_types_def[] = { "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL }; -static const char * const *of_get_probes(struct device_node *dp) -{ - const char *cp; - int cplen; - unsigned int l; - unsigned int count; - const char **res; - - cp = of_get_property(dp, "linux,part-probe", &cplen); - if (cp == NULL) - return part_probe_types_def; - - count = 0; - for (l = 0; l != cplen; l++) - if (cp[l] == 0) - count++; - - res = kzalloc((count + 1)*sizeof(*res), GFP_KERNEL); - if (!res) - return NULL; - count = 0; - while (cplen > 0) { - res[count] = cp; - l = strlen(cp) + 1; - cp += l; - cplen -= l; - count++; - } - return res; -} - -static void of_free_probes(const char * const *probes) -{ - if (probes != part_probe_types_def) - kfree(probes); -} - static const struct of_device_id of_flash_match[]; static int of_flash_probe(struct platform_device *dev) { - const char * const *part_probe_types; const struct of_device_id *match; struct device_node *dp = dev->dev.of_node; struct resource res; @@ -320,14 +282,8 @@ static int of_flash_probe(struct platform_device *dev) info->cmtd->dev.parent = &dev->dev; 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, NULL, + mtd_device_parse_register(info->cmtd, part_probe_types_def, NULL, NULL, 0); - of_free_probes(part_probe_types); kfree(mtd_list);