On Fri, Sep 5, 2014 at 2:03 PM, Bryan Wu <cooloney@xxxxxxxxx> wrote:
> On Wed, Aug 20, 2014 at 6:41 AM, Jacek Anaszewski
> <j.anaszewski@xxxxxxxxxxx> wrote:
>> 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 becomes required for reading current
>> brightness from a LED device. This patch adds checking of return value
>> of the brightness_get callback and moves the led_update_brightness()
>> function to the LED subsystem public API.
>>
>
> This one looks good to me.
> Thanks,
> -Bryan
>
Merged， no need to update this patch then.
-Bryan
>> Signed-off-by: Jacek Anaszewski <j.anaszewski@xxxxxxxxxxx>
>> Acked-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
>> Cc: Bryan Wu <cooloney@xxxxxxxxx>
>> Cc: Richard Purdie <rpurdie@xxxxxxxxx>
>> ---
>> drivers/leds/led-class.c | 6 ------
>> drivers/leds/led-core.c | 16 ++++++++++++++++
>> include/linux/leds.h | 10 ++++++++++
>> 3 files changed, 26 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
>> index f4e5bb4..6f82a76 100644
>> --- a/drivers/leds/led-class.c
>> +++ b/drivers/leds/led-class.c
>> @@ -23,12 +23,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 8380eb7..466ce5a 100644
>> --- a/drivers/leds/led-core.c
>> +++ b/drivers/leds/led-core.c
>> @@ -127,3 +127,19 @@ void led_set_brightness(struct led_classdev *led_cdev,
>> __led_set_brightness(led_cdev, brightness);
>> }
>> EXPORT_SYMBOL(led_set_brightness);
>> +
>> +int led_update_brightness(struct led_classdev *led_cdev)
>> +{
>> + int ret = 0;
>> +
>> + if (led_cdev->brightness_get) {
>> + ret = led_cdev->brightness_get(led_cdev);
>> + if (ret >= 0) {
>> + led_cdev->brightness = ret;
>> + return 0;
>> + }
>> + }
>> +
>> + return ret;
>> +}
>> +EXPORT_SYMBOL(led_update_brightness);
>> diff --git a/include/linux/leds.h b/include/linux/leds.h
>> index bc221d11..cc85b16 100644
>> --- a/include/linux/leds.h
>> +++ b/include/linux/leds.h
>> @@ -139,6 +139,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
>> + *
>> + * 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 Triggers
>> --
>> 1.7.9.5
>>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
