From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753925AbbIPKsf (ORCPT ); Wed, 16 Sep 2015 06:48:35 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:44496 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751839AbbIPKsd (ORCPT ); Wed, 16 Sep 2015 06:48:33 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-2f-55f948f2538c From: Jacek Anaszewski To: linux-leds@vger.kernel.org Cc: linux-kernel@vger.kernel.org, andrew@lunn.ch, sakari.ailus@linux.intel.com, stsp@users.sourceforge.net, pavel@ucw.cz, ospite@studenti.unina.it, davem@davemloft.net, linus.walleij@linaro.org, ricardo.ribalda@gmail.com, p.meerwald@bct-electronic.com, Jacek Anaszewski Subject: [PATCH 5/5] leds: core: Use set_brightness_work for the blocking op Date: Wed, 16 Sep 2015 12:47:44 +0200 Message-id: <1442400464-27367-6-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1442400464-27367-1-git-send-email-j.anaszewski@samsung.com> References: <1442400464-27367-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBLMWRmVeSWpSXmKPExsVy+t9jQd1PHj9DDQ618Fucv3uI2WLO+RYW i96rzxktpvxZzmRxedccNoutb9YxWvzu3s1i0XdI0uLuqaNsFl3d85gsPm35xmTR2TeNxYHH Y8W9u0weW1beZPLYOesuu8eda3vYPOadDPTYueMzk0ffllWMHocurGPxWLH6O7tH06l2Vo/P m+QCuKO4bFJSczLLUov07RK4Ml6v+cJSsEymouF5O1MD4znxLkZODgkBE4nDa3cwQ9hiEhfu rWfrYuTiEBKYxSgxqW0uC4Tzk1Fi67PL7CBVbAKGEj9fvGbqYuTgEBGQk9h5phKkhllgHZNE 58KDLCBxYQEfibZ5oSAmi4CqxK8Z4SAmr4CHxLUdFiCmhICCxJxJNiDzOAU8Jea/O80IYgsB VSy7eYtxAiPvAkaGVYwSqQXJBcVJ6bmGeanlesWJucWleel6yfm5mxjB4ftMagfjwV3uhxgF OBiVeHhfPPsRKsSaWFZcmXuIUYKDWUmE95HVz1Ah3pTEyqrUovz4otKc1OJDjNIcLErivLIr n4UKCaQnlqRmp6YWpBbBZJk4OKUaGC+wTlkUXZkQbZ2y4M3klE5Jptx5iZmPb1zaHMegeMKx c3nVtZrlXluKOhP3zb8uXPPWxu2twKrPgVe9ZngW1ZZ9S8ve8/apIu815aPvLna69B6J0zh/ emdXz+nw+TcenjPbEM8+88y7XdEeSw8+72Q/e3Su2q9FClyMr3cKrLDPadN+9utHW6QSS3FG oqEWc1FxIgBLbnS+WwIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch makes LED core capable of setting brightness for drivers that implement brightness_set_blocking op. It removes from LED class drivers responsibility for using work queues on their own. In order to achieve this set_brightness_delayed callback is being modified to call newly added __led_set_brightness helper instead of led_set_brightness_async. led_set_brightness_async function didn't set brightness in an asynchronous way in all cases. It was mistakenly assuming that all LED subsystem drivers used work queue in their brightness_set op, whereas only half of them did that. Since it has no users now, it is being removed. Signed-off-by: Jacek Anaszewski --- drivers/leds/led-core.c | 22 +++++++++++++++++++++- drivers/leds/leds.h | 10 ---------- include/linux/leds.h | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index fe6c2df..d8649f1 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -25,6 +25,22 @@ EXPORT_SYMBOL_GPL(leds_list_lock); LIST_HEAD(leds_list); EXPORT_SYMBOL_GPL(leds_list); +static int __led_set_brightness(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + int ret = 0; + + if (led_cdev->brightness_set) + led_cdev->brightness_set(led_cdev, led_cdev->brightness); + else if (led_cdev->brightness_set_blocking) + ret = led_cdev->brightness_set_blocking(led_cdev, + led_cdev->brightness); + else + return -EINVAL; + + return ret; +} + static void led_timer_function(unsigned long data) { struct led_classdev *led_cdev = (void *)data; @@ -83,6 +99,7 @@ static void set_brightness_delayed(struct work_struct *ws) { struct led_classdev *led_cdev = container_of(ws, struct led_classdev, set_brightness_work); + int ret; if (led_cdev->flags & LED_BLINK_DISABLE) { led_cdev->delayed_set_value = LED_OFF; @@ -90,7 +107,10 @@ static void set_brightness_delayed(struct work_struct *ws) led_cdev->flags &= ~LED_BLINK_DISABLE; } - led_set_brightness_async(led_cdev, led_cdev->delayed_set_value); + ret = __led_set_brightness(led_cdev, led_cdev->delayed_set_value); + if (ret < 0) + dev_err(led_cdev->dev, + "Setting an LED's brightness failed (%d)\n", ret); } static void led_set_software_blink(struct led_classdev *led_cdev, diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h index 11520eb..04b8e41 100644 --- a/drivers/leds/leds.h +++ b/drivers/leds/leds.h @@ -16,16 +16,6 @@ #include #include -static inline void led_set_brightness_async(struct led_classdev *led_cdev, - enum led_brightness value) -{ - value = min(value, led_cdev->max_brightness); - led_cdev->brightness = value; - - if (!(led_cdev->flags & LED_SUSPENDED)) - led_cdev->brightness_set(led_cdev, value); -} - static inline int led_set_brightness_sync(struct led_classdev *led_cdev, enum led_brightness value) { diff --git a/include/linux/leds.h b/include/linux/leds.h index 9f850e6..ae3c178 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -155,7 +155,7 @@ extern void led_blink_set_oneshot(struct led_classdev *led_cdev, * * Set an LED's brightness, and, if necessary, cancel the * software blink timer that implements blinking when the - * hardware doesn't. + * hardware doesn't. This function is guaranteed not to sleep. */ extern void led_set_brightness(struct led_classdev *led_cdev, enum led_brightness brightness); -- 1.7.9.5