Commit 9615a299 authored Aug 25, 2015 by Milo Kim Committed by Sebastian Reichel Sep 22, 2015

power:lp8727_charger: parsing child node after getting debounce-ms



According to lp8727 bindings[*], charging parameter is optional.
So parsing can be skipped in case those properties are undefined.
However, 'debounce-ms' should be read prior to checking the properties.
Otherwise, 'debounce-ms' property will be ignored even it is configured
inside the DT.
So, counting child is processed after updating 'debounce-ms'.

[*] Documentation/devicetree/bindings/power_supply/lp8727_charger.txt

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Milo Kim <milo.kim@ti.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

parent 87d931d5

drivers/power/lp8727_charger.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -515,16 +515,16 @@ static struct lp8727_platform_data lp8727_parse_dt(struct device dev)
		struct lp8727_platform_data *pdata;
		const char *type;

		/* If charging parameter is not defined, just skip parsing the dt */
		if (of_get_child_count(np) == 0)
		return NULL;

		pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
		if (!pdata)
		return ERR_PTR(-ENOMEM);

		of_property_read_u32(np, "debounce-ms", &pdata->debounce_msec);

		/* If charging parameter is not defined, just skip parsing the dt */
		if (of_get_child_count(np) == 0)
		return pdata;

		for_each_child_of_node(np, child) {
		of_property_read_string(child, "charger-type", &type);