From: Jonathan Bakker Date: Thu, 14 May 2020 23:04:34 +0000 (-0700) Subject: power: supply: charger-manager: Count cm-chargers property directly X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=683aa86eb16ab8cf91075654d08ef7409f160e35;p=linux.git power: supply: charger-manager: Count cm-chargers property directly Rather than having a cm-chargers and a separate cm-num-chargers property, simply count the entries in cm-chargers. Signed-off-by: Jonathan Bakker Signed-off-by: Sebastian Reichel --- diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c index 5f536284d2ca9..07992821e2523 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1311,8 +1311,8 @@ static struct charger_desc *of_cm_parse_desc(struct device *dev) desc->battery_present = battery_stat; /* chargers */ - of_property_read_u32(np, "cm-num-chargers", &num_chgs); - if (num_chgs) { + num_chgs = of_property_count_strings(np, "cm-chargers"); + if (num_chgs > 0) { int i; /* Allocate empty bin at the tail of array */