leds: various: use only available OF children

Various drivers count and iterate over OF children nodes via
of_get_child_count and for_each_child_of_node. Instead they should use
of_get_available_child_count and for_each_available_child_of_node, so
that if a given node has the `status` property set to `disabled`, the
child will be ignored.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Andrey Utkin <andrey_utkin@fastmail.com>
Cc: Baolin Wang <baolin.wang7@gmail.com>
Cc: Baolin Wang <baolin.wang@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Christian Mauderer <oss@c-mauderer.de>
Cc: Chunyan Zhang <zhang.lyra@gmail.com>
Cc: Dan Murphy <dmurphy@ti.com>
Cc: David Rivshin <drivshin@allworx.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: H. Nikolaus Schaller <hns@goldelico.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Milo Kim <milo.kim@ti.com>
Cc: NeilBrown <neilb@suse.de>
Cc: Nikita Travkin <nikitos.tr@gmail.com>
Cc: Orson Zhai <orsonzhai@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Philippe Retornaz <philippe.retornaz@epfl.ch>
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Simon Guinot <sguinot@lacie.com>
Cc: Simon Shields <simon@lineageos.org>
Cc: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Cc: Xiaotong Lu <xiaotong.lu@spreadtrum.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
index 2d1b3269e0f7f51027ed78f80242bf7d88fc587d..508d0d859f2e022c25090feb01498aa81a1e8a3f 100644 (file)
--- a/drivers/leds/leds-88pm860x.c
+++ b/drivers/leds/leds-88pm860x.c
@@ -125,7 +125,7 @@ static int pm860x_led_dt_init(struct platform_device *pdev,
                dev_err(&pdev->dev, "failed to find leds node\n");
                return -ENODEV;
        }
-       for_each_child_of_node(nproot, np) {
+       for_each_available_child_of_node(nproot, np) {
                if (of_node_name_eq(np, data->name)) {
                        of_property_read_u32(np, "marvell,88pm860x-iset",
                                             &iset);

diff --git a/drivers/leds/leds-an30259a.c b/drivers/leds/leds-an30259a.c
index 8ec23ccd02d699089b196bb10c95b6aff4be909c..9749f1cc3e15fe38904d41ca3659a07dc63a2fb0 100644 (file)
--- a/drivers/leds/leds-an30259a.c
+++ b/drivers/leds/leds-an30259a.c
@@ -208,7 +208,7 @@ static int an30259a_dt_init(struct i2c_client *client,
        const char *str;
        struct an30259a_led *led;
 
-       count = of_get_child_count(np);
+       count = of_get_available_child_count(np);
        if (!count || count > AN30259A_MAX_LEDS)
                return -EINVAL;
 

diff --git a/drivers/leds/leds-aw2013.c b/drivers/leds/leds-aw2013.c
index 3aeed4f68a8a35a27eb521677fd142c77f23e533..9df7de042bca2412c19b01878f3aadefbd649a98 100644 (file)
--- a/drivers/leds/leds-aw2013.c
+++ b/drivers/leds/leds-aw2013.c
@@ -265,7 +265,7 @@ static int aw2013_probe_dt(struct aw2013 *chip)
        int count, ret = 0, i = 0;
        struct aw2013_led *led;
 
-       count = of_get_child_count(np);
+       count = of_get_available_child_count(np);
        if (!count || count > AW2013_MAX_LEDS)
                return -EINVAL;
 

diff --git a/drivers/leds/leds-is31fl319x.c b/drivers/leds/leds-is31fl319x.c
index e6d185ad0b7e627169e03b1db8056cb25caf59d4..4161b9dd7e488271e9b9a2563da843c84fa2bb55 100644 (file)
--- a/drivers/leds/leds-is31fl319x.c
+++ b/drivers/leds/leds-is31fl319x.c
@@ -220,7 +220,7 @@ static int is31fl319x_parse_dt(struct device *dev,
 
        is31->cdef = device_get_match_data(dev);
 
-       count = of_get_child_count(np);
+       count = of_get_available_child_count(np);
 
        dev_dbg(dev, "probing with %d leds defined in DT\n", count);
 
@@ -230,7 +230,7 @@ static int is31fl319x_parse_dt(struct device *dev,
                return -ENODEV;
        }
 
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                struct is31fl319x_led *led;
                u32 reg;
 

diff --git a/drivers/leds/leds-is31fl32xx.c b/drivers/leds/leds-is31fl32xx.c
index 82bbf0290ff9d11ab06b9f4186fc1586defe08cc..b3faf050eece76bd595e04672356a23f536c0dc8 100644 (file)
--- a/drivers/leds/leds-is31fl32xx.c
+++ b/drivers/leds/leds-is31fl32xx.c
@@ -372,7 +372,7 @@ static int is31fl32xx_parse_dt(struct device *dev,
        struct device_node *child;
        int ret = 0;
 
-       for_each_child_of_node(dev_of_node(dev), child) {
+       for_each_available_child_of_node(dev_of_node(dev), child) {
                struct is31fl32xx_led_data *led_data =
                        &priv->leds[priv->num_leds];
                const struct is31fl32xx_led_data *other_led_data;
@@ -435,7 +435,7 @@ static int is31fl32xx_probe(struct i2c_client *client,
 
        cdef = device_get_match_data(dev);
 
-       count = of_get_child_count(dev_of_node(dev));
+       count = of_get_available_child_count(dev_of_node(dev));
        if (!count)
                return -EINVAL;
 

diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c
index 56210f4ad919a07aab9a09213dea25216a31c824..50f7f5b874636202df15dde2d68e39ae35718170 100644 (file)
--- a/drivers/leds/leds-lp55xx-common.c
+++ b/drivers/leds/leds-lp55xx-common.c
@@ -611,7 +611,7 @@ static int lp55xx_parse_multi_led(struct device_node *np,
        struct device_node *child;
        int num_colors = 0, ret;
 
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                ret = lp55xx_parse_multi_led_child(child, cfg, child_number,
                                                   num_colors);
                if (ret)
@@ -665,7 +665,7 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev,
        if (!pdata)
                return ERR_PTR(-ENOMEM);
 
-       num_channels = of_get_child_count(np);
+       num_channels = of_get_available_child_count(np);
        if (num_channels == 0) {
                dev_err(dev, "no LED channels\n");
                return ERR_PTR(-EINVAL);
@@ -679,7 +679,7 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev,
        pdata->num_channels = num_channels;
        cfg->max_channel = chip->cfg->max_channel;
 
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                ret = lp55xx_parse_logical_led(child, cfg, i);
                if (ret)
                        return ERR_PTR(-EINVAL);

diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index ee37f4a2d65b4a24deab3ca66788e2949e747b29..675502c15c2b40d07907d9e576c254ac8de58c50 100644 (file)
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -131,7 +131,7 @@ static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
        if (ret)
                goto out_node_put;
 
-       pdata->num_leds = of_get_child_count(parent);
+       pdata->num_leds = of_get_available_child_count(parent);
 
        pdata->led = devm_kcalloc(dev, pdata->num_leds, sizeof(*pdata->led),
                                  GFP_KERNEL);
@@ -140,7 +140,7 @@ static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
                goto out_node_put;
        }
 
-       for_each_child_of_node(parent, child) {
+       for_each_available_child_of_node(parent, child) {
                const char *str;
                u32 tmp;
 

diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index 9a3b2d15764d297144cf0457c28ab244a057031d..e6fd47365b58871c0aa65ccdaaaf2076a7d7888c 100644 (file)
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -485,7 +485,7 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
        }
 
        /* LEDs */
-       num_leds = of_get_child_count(np);
+       num_leds = of_get_available_child_count(np);
        if (!num_leds) {
                dev_err(dev, "No LED subnodes found in DT\n");
                return -ENODEV;
@@ -496,7 +496,7 @@ static int netxbig_leds_get_of_pdata(struct device *dev,
                return -ENOMEM;
 
        led = leds;
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                const char *string;
                int *mode_val;
                int num_modes;

diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index 9cbd2d7251af9d7c205acfac31073341a9e90021..22d38c83b6dca735ffc827d57c245fd74be82b15 100644 (file)
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -251,7 +251,7 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata)
        struct ns2_led *led, *leds;
        int ret, num_leds = 0;
 
-       num_leds = of_get_child_count(np);
+       num_leds = of_get_available_child_count(np);
        if (!num_leds)
                return -ENODEV;
 
@@ -261,7 +261,7 @@ ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata)
                return -ENOMEM;
 
        led = leds;
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                const char *string;
                int i, num_modes;
                struct ns2_led_modval *modval;

diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index b1ae34e509588ad059ddd463510f4041b4319c9a..f834550999ddb4fb6a2553aa36461f3cee9625fc 100644 (file)
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -478,7 +478,7 @@ pca9532_of_populate_pdata(struct device *dev, struct device_node *np)
        if (!pdata)
                return ERR_PTR(-ENOMEM);
 
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                if (of_property_read_string(child, "label",
                                            &pdata->leds[i].name))
                        pdata->leds[i].name = child->name;

diff --git a/drivers/leds/leds-powernv.c b/drivers/leds/leds-powernv.c
index cd43d5dff7f48a0c532cc61af02ac8040821364f..743e2cdd0891b3bf96985f8edc14bfff26fbb50a 100644 (file)
--- a/drivers/leds/leds-powernv.c
+++ b/drivers/leds/leds-powernv.c
@@ -250,7 +250,7 @@ static int powernv_led_classdev(struct platform_device *pdev,
        struct powernv_led_data *powernv_led;
        struct device *dev = &pdev->dev;
 
-       for_each_child_of_node(led_node, np) {
+       for_each_available_child_of_node(led_node, np) {
                p = of_find_property(np, "led-types", NULL);
 
                while ((cur = of_prop_next_string(p, cur)) != NULL) {

diff --git a/drivers/leds/leds-sc27xx-bltc.c b/drivers/leds/leds-sc27xx-bltc.c
index f8fe09ecd0d181ec22726aea7451c9cfff78a81d..e199ea15e40680ff1053b400f5fdbc931a54683a 100644 (file)
--- a/drivers/leds/leds-sc27xx-bltc.c
+++ b/drivers/leds/leds-sc27xx-bltc.c
@@ -281,7 +281,7 @@ static int sc27xx_led_probe(struct platform_device *pdev)
        u32 base, count, reg;
        int err;
 
-       count = of_get_child_count(np);
+       count = of_get_available_child_count(np);
        if (!count || count > SC27XX_LEDS_MAX)
                return -EINVAL;
 
@@ -305,7 +305,7 @@ static int sc27xx_led_probe(struct platform_device *pdev)
                return err;
        }
 
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                err = of_property_read_u32(child, "reg", &reg);
                if (err) {
                        of_node_put(child);

diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c
index ecfd349fa53beb3076ab6acade121122dbba842a..f1964c96fb15915435bc3a4d0d9379d0bcc1b2ff 100644 (file)
--- a/drivers/leds/leds-spi-byte.c
+++ b/drivers/leds/leds-spi-byte.c
@@ -87,11 +87,11 @@ static int spi_byte_probe(struct spi_device *spi)
        const char *state;
        int ret;
 
-       if (of_get_child_count(dev_of_node(dev)) != 1) {
+       if (of_get_available_child_count(dev_of_node(dev)) != 1) {
                dev_err(dev, "Device must have exactly one LED sub-node.");
                return -EINVAL;
        }
-       child = of_get_next_child(dev_of_node(dev), NULL);
+       child = of_get_next_available_child(dev_of_node(dev), NULL);
 
        led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
        if (!led)

diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index d44b64af6d6e7486e5b702d519627468e7ffafda..a7e9fd85b6dd5c7fe49527781f743ef370ecfeaa 100644 (file)
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -694,7 +694,7 @@ tca6507_led_dt_init(struct i2c_client *client)
        struct led_info *tca_leds;
        int count;
 
-       count = of_get_child_count(np);
+       count = of_get_available_child_count(np);
        if (!count || count > NUM_LEDS)
                return ERR_PTR(-ENODEV);
 
@@ -703,7 +703,7 @@ tca6507_led_dt_init(struct i2c_client *client)
        if (!tca_leds)
                return ERR_PTR(-ENOMEM);
 
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                struct led_info led;
                u32 reg;
                int ret;

diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
index f4d5785f0068f937044e53cfb4e6141e0ba8dd3b..5e84a0c7aacbd3c5064f9888815ca5d43dbed400 100644 (file)
--- a/drivers/leds/leds-tlc591xx.c
+++ b/drivers/leds/leds-tlc591xx.c
@@ -158,7 +158,7 @@ tlc591xx_probe(struct i2c_client *client,
        if (!np)
                return -ENODEV;
 
-       count = of_get_child_count(np);
+       count = of_get_available_child_count(np);
        if (!count || count > tlc591xx->max_leds)
                return -EINVAL;
 
@@ -180,7 +180,7 @@ tlc591xx_probe(struct i2c_client *client,
        if (err < 0)
                return err;
 
-       for_each_child_of_node(np, child) {
+       for_each_available_child_of_node(np, child) {
                struct tlc591xx_led *led;
                struct led_init_data init_data = {};