Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4b1caa authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Brian Norris
Browse files

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: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent b3bb6d6a

drivers/mtd/maps/physmap_of_core.c

+10 −20
Original line number Diff line number Diff line
@@ -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);

	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;

}