From: Jean-Jacques Hiblot <jjhiblot@ti.com>
To: <jacek.anaszewski@gmail.com>, <pavel@ucw.cz>,
<robh+dt@kernel.org>, <mark.rutland@arm.com>,
<daniel.thompson@linaro.org>
Cc: <dmurphy@ti.com>, <linux-leds@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
Jean-Jacques Hiblot <jjhiblot@ti.com>
Subject: [PATCH v3 3/3] leds: Make led_set_brightness_sync() also use __led_set_brightness()
Date: Wed, 17 Jul 2019 15:59:48 +0200 [thread overview]
Message-ID: <20190717135948.19340-4-jjhiblot@ti.com> (raw)
In-Reply-To: <20190717135948.19340-1-jjhiblot@ti.com>
There are some LED drivers that do not implement brightness_set_blocking(),
for those drivers led_set_brightness_sync() cannot work.
Fixing it by calling first __led_set_brightness() and falling back to
__led_set_brightness_blocking() if it failed.
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
drivers/leds/led-core.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index dab32cf778f2..4a0506081c0e 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -320,15 +320,19 @@ int led_set_brightness_sync(struct led_classdev *led_cdev,
if (led_cdev->blink_delay_on || led_cdev->blink_delay_off)
return -EBUSY;
- led_cdev->brightness = min(value, led_cdev->max_brightness);
+ value = min(value, led_cdev->max_brightness);
if (led_cdev->flags & LED_SUSPENDED)
return 0;
- ret = __led_set_brightness_blocking(led_cdev, led_cdev->brightness);
+ ret = __led_set_brightness(led_cdev, value);
+ if (ret == -ENOTSUPP)
+ ret = __led_set_brightness_blocking(led_cdev, value);
if (ret)
return ret;
+ led_cdev->brightness = value;
+
return __led_handle_regulator(led_cdev, led_cdev->brightness);
}
EXPORT_SYMBOL_GPL(led_set_brightness_sync);
--
2.17.1
prev parent reply other threads:[~2019-07-17 14:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 13:59 [PATCH v3 0/3] leds: Add control of the voltage/current regulator to the LED core Jean-Jacques Hiblot
2019-07-17 13:59 ` [PATCH v3 1/3] dt-bindings: leds: document the "power-supply" property Jean-Jacques Hiblot
2019-07-17 13:59 ` [PATCH v3 2/3] leds: Add control of the voltage/current regulator to the LED core Jean-Jacques Hiblot
2019-07-18 12:24 ` Jacek Anaszewski
2019-07-18 13:31 ` Jean-Jacques Hiblot
2019-07-18 17:49 ` Jacek Anaszewski
2019-09-20 12:29 ` Jean-Jacques Hiblot
2019-07-17 13:59 ` Jean-Jacques Hiblot [this message]
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=20190717135948.19340-4-jjhiblot@ti.com \
--to=jjhiblot@ti.com \
--cc=daniel.thompson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dmurphy@ti.com \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pavel@ucw.cz \
--cc=robh+dt@kernel.org \
/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).