mtd: physmap_of: use OF helpers for reading strings

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=da4b1caa49cbfac4e5be2c4b080b8d01b04358dd
Commit:     da4b1caa49cbfac4e5be2c4b080b8d01b04358dd
Parent:     b3bb6d6a0fe1c893fbcaaac8bf97c49f6ec6684e
Author:     Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Thu Mar 30 17:58:53 2017 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Apr 19 15:26:26 2017 -0700

    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 at milecki.pl>
    Reviewed-by: Boris Brezillon <boris.brezillon at free-electrons.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/maps/physmap_of_core.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c
index 14e8909..62fa683 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;
 }