Skip to content

Commit

Permalink
power:lp8727_charger: parsing child node after getting debounce-ms
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Milo Kim authored and Sebastian Reichel committed Sep 22, 2015
1 parent 87d931d commit 9615a29
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/power/lp8727_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 9615a29

Please sign in to comment.