diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-03-30 17:58:53 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-04-19 15:26:26 -0700 |
| commit | da4b1caa49cbfac4e5be2c4b080b8d01b04358dd (patch) | |
| tree | fca43ee8b4d291494c7a418df39d73e597f4a0a1 /drivers/mtd/maps | |
| parent | b3bb6d6a0fe1c893fbcaaac8bf97c49f6ec6684e (diff) | |
| download | linux-next-da4b1caa49cbfac4e5be2c4b080b8d01b04358dd.tar.gz | |
mtd: physmap_of: use OF helpers for reading strings
OF core code provides helpers for counting strings and reading them so
use them instead of doing this manually. This simplifies the code a bit.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/maps')
| -rw-r--r-- | drivers/mtd/maps/physmap_of_core.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c index 14e8909c9955..62fa6836f218 100644 --- a/drivers/mtd/maps/physmap_of_core.c +++ b/drivers/mtd/maps/physmap_of_core.c @@ -116,32 +116,22 @@ static const char * const part_probe_types_def[] = { 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; + int count; - cp = of_get_property(dp, "linux,part-probe", &cplen); - if (cp == NULL) + count = of_property_count_strings(dp, "linux,part-probe"); + if (count < 0) 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); + 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++; - } + + count = of_property_read_string_array(dp, "linux,part-probe", res, + count); + if (count < 0) + return NULL; + return res; } |