From: Josh Wu <josh.wu@atmel.com>
To: cooloney@gmail.com, rpurdie@rpsys.net
Cc: linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, Josh Wu <josh.wu@atmel.com>
Subject: [PATCH] leds-gpio: of: led should not be created if its status is disabled
Date: Tue, 24 Sep 2013 16:04:22 +0800 [thread overview]
Message-ID: <1380009863-6454-1-git-send-email-josh.wu@atmel.com> (raw)
now the leds-gpio driver will create every child led node without
checking the status is disabled or not.
for example, if we have a led node like d3, and its status is disabled:
leds {
d3 {
label = "d3";
gpios = <&pioE 24 0>;
status = "disabled";
};
};
we except the d3 should not be created. And the gpios should not be
request as well.
But current driver will create d3 and request its gpio.
This patch fix this by using for_each_available_child_of_node() to
enumerate all child nodes. So the disabled node will be inavilable.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
drivers/leds/leds-gpio.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index e8b01e5..9bb4e04 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -167,23 +167,23 @@ static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node, *child;
struct gpio_leds_priv *priv;
- int count, ret;
+ int count = 0, ret;
/* count LEDs in this device, so we know how much to allocate */
- count = of_get_child_count(np);
- if (!count)
- return ERR_PTR(-ENODEV);
-
- for_each_child_of_node(np, child)
+ for_each_available_child_of_node(np, child) {
+ count++;
if (of_get_gpio(child, 0) == -EPROBE_DEFER)
return ERR_PTR(-EPROBE_DEFER);
+ }
+ if (!count)
+ return ERR_PTR(-ENODEV);
priv = devm_kzalloc(&pdev->dev, sizeof_gpio_leds_priv(count),
GFP_KERNEL);
if (!priv)
return ERR_PTR(-ENOMEM);
- for_each_child_of_node(np, child) {
+ for_each_available_child_of_node(np, child) {
struct gpio_led led = {};
enum of_gpio_flags flags;
const char *state;
--
1.7.9.5
next reply other threads:[~2013-09-24 8:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 8:04 Josh Wu [this message]
2013-09-24 17:35 ` [PATCH] leds-gpio: of: led should not be created if its status is disabled Bryan Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380009863-6454-1-git-send-email-josh.wu@atmel.com \
--to=josh.wu@atmel.com \
--cc=cooloney@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=rpurdie@rpsys.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).