From: Jacek Anaszewski <j.anaszewski@samsung.com>
To: linux-media@vger.kernel.org, linux-leds@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: s.nawrocki@samsung.com, a.hajda@samsung.com,
kyungmin.park@samsung.com,
Jacek Anaszewski <j.anaszewski@samsung.com>,
Bryan Wu <cooloney@gmail.com>, Richard Purdie <rpurdie@rpsys.net>
Subject: [PATCH/RFC 2/8] leds: Improve and export led_update_brightness function
Date: Thu, 20 Mar 2014 15:51:04 +0100 [thread overview]
Message-ID: <1395327070-20215-3-git-send-email-j.anaszewski@samsung.com> (raw)
In-Reply-To: <1395327070-20215-1-git-send-email-j.anaszewski@samsung.com>
led_update_brightness helper function used to be exploited
only locally in the led-class.c module, where its result was
being passed to the brightness_show sysfs callback. With the
introduction of v4l2-flash subdevice the same functionality
became required for checking the current flash strobe status.
This patch adds checking brightness_get callback error code
and adds the function to the LED subsystem public API.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
---
drivers/leds/led-class.c | 6 ------
drivers/leds/led-core.c | 17 +++++++++++++++++
include/linux/leds.h | 10 ++++++++++
3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 0510532..04de352 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -27,12 +27,6 @@
static struct class *leds_class;
-static void led_update_brightness(struct led_classdev *led_cdev)
-{
- if (led_cdev->brightness_get)
- led_cdev->brightness = led_cdev->brightness_get(led_cdev);
-}
-
static ssize_t brightness_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 093703c..21ceda1 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -166,6 +166,23 @@ void led_set_brightness(struct led_classdev *led_cdev,
}
EXPORT_SYMBOL(led_set_brightness);
+int led_update_brightness(struct led_classdev *led_cdev)
+{
+ int ret;
+
+ if (led_cdev->brightness_get == NULL)
+ return -EINVAL;
+
+ ret = led_cdev->brightness_get(led_cdev);
+ if (ret >= 0)
+ led_cdev->brightness = ret;
+ else
+ return ret;
+
+ return 0;
+}
+EXPORT_SYMBOL(led_update_brightness);
+
int led_set_flash_mode(struct led_classdev *led_cdev,
bool flash_mode)
{
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 1bf0ab3..5bf05cc 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -190,6 +190,16 @@ extern void led_blink_set_oneshot(struct led_classdev *led_cdev,
extern void led_set_brightness(struct led_classdev *led_cdev,
enum led_brightness brightness);
/**
+ * led_update_brightness - update LED brightness
+ * @led_cdev: the LED to query about
+ *
+ * Get an LED's current brightness and update led_cdev->brightness
+ * member with the obtained value.
+ *
+ * Returns: 0 on success or negative error value on failure
+ */
+extern int led_update_brightness(struct led_classdev *led_cdev);
+
/**
* led_set_flash_mode - set LED flash mode
* @led_cdev: the LED to set
--
1.7.9.5
next prev parent reply other threads:[~2014-03-20 14:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 14:51 [PATCH/RFC 0/8] LED / flash API integration Jacek Anaszewski
2014-03-20 14:51 ` [PATCH/RFC 1/8] leds: Add sysfs and kernel internal API for flash LEDs Jacek Anaszewski
2014-03-20 15:28 ` Richard Purdie
2014-03-21 8:27 ` Jacek Anaszewski
2014-03-23 23:18 ` Sakari Ailus
2014-03-28 15:30 ` Jacek Anaszewski
2014-03-31 9:26 ` Sakari Ailus
2014-03-20 14:51 ` Jacek Anaszewski [this message]
2014-03-23 23:20 ` [PATCH/RFC 2/8] leds: Improve and export led_update_brightness function Sakari Ailus
2014-03-20 14:51 ` [PATCH/RFC 3/8] Documentation: leds: Add description of flash mode Jacek Anaszewski
2014-03-20 14:51 ` [PATCH/RFC 4/8] media: Add registration helpers for V4L2 flash sub-devices Jacek Anaszewski
2014-03-24 0:08 ` Sakari Ailus
2014-03-28 15:30 ` Jacek Anaszewski
2014-03-31 9:37 ` Sakari Ailus
2014-03-20 14:51 ` [PATCH/RFC 5/8] media: exynos4-is: Add support for v4l2-flash subdevs Jacek Anaszewski
2014-03-20 14:51 ` [PATCH/RFC 6/8] leds: Add support for max77693 mfd flash cell Jacek Anaszewski
2014-03-20 15:34 ` Lee Jones
2014-03-21 8:22 ` Jacek Anaszewski
2014-03-21 9:36 ` Lee Jones
2014-03-20 14:51 ` [PATCH/RFC 7/8] DT: Add documentation for the mfd Maxim max77693 " Jacek Anaszewski
[not found] ` <1395327070-20215-1-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2014-03-20 14:51 ` [PATCH/RFC 8/8] DT: Add documentation for exynos4-is camera-flash property Jacek Anaszewski
2014-03-24 1:05 ` Sakari Ailus
2014-03-28 15:31 ` Jacek Anaszewski
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=1395327070-20215-3-git-send-email-j.anaszewski@samsung.com \
--to=j.anaszewski@samsung.com \
--cc=a.hajda@samsung.com \
--cc=cooloney@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=rpurdie@rpsys.net \
--cc=s.nawrocki@samsung.com \
/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).