From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752804AbbJGJLP (ORCPT ); Wed, 7 Oct 2015 05:11:15 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:60697 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752758AbbJGJLJ (ORCPT ); Wed, 7 Oct 2015 05:11:09 -0400 X-AuditID: cbfee61b-f79d56d0000048c5-a9-5614e1aab913 From: Jacek Anaszewski To: linux-leds@vger.kernel.org Cc: linux-kernel@vger.kernel.org, pavel@ucw.cz, sakari.ailus@linux.intel.com, andrew@lunn.ch, Jacek Anaszewski Subject: [PATCH v3 04/10] leds: core: Use set_brightness_work for the blocking op Date: Wed, 07 Oct 2015 11:10:42 +0200 Message-id: <1444209048-29415-5-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1444209048-29415-1-git-send-email-j.anaszewski@samsung.com> References: <1444209048-29415-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjluLIzCtJLcpLzFFi42I5/e+xoO7qhyJhBk3uFufvHmK26L36nNHi 8q45bBZb36xjtLh76iibxact35gc2DzmnQz02LnjM5NH35ZVjB4rVn9n9/i8SS6ANYrLJiU1 J7MstUjfLoEr48/aR0wFFyUq5k05xdLAeECki5GTQ0LAROL0jPmsELaYxIV769lAbCGBWYwS D5drdDFyAdk/GSVmPJrODpJgEzCU+PniNVMXIweHiICcxM4zlSA1zALdjBLLLncxgtQICwRL 9D3cAzaIRUBVYvXPP2BxXgEPic1NX9hBeiUEFCTmTLIBCXMKeEo09p5ggtjrIXH41xe2CYy8 CxgZVjFKpBYkFxQnpeca5aWW6xUn5haX5qXrJefnbmIEh9Iz6R2Mh3e5H2IU4GBU4uH9YSwS JsSaWFZcmXuIUYKDWUmEd+E9oBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeG4cYwoQE0hNLUrNT UwtSi2CyTBycUg2Mldu077ZxMJV8Yv4Z68a8UO3Ew01vs1aE/c2Uv/vt3y0zcxOT1TN8/777 l5/21rB2kXDlkQfrmZQ/uFou+rAqfMIzdzGz+k/XxBs5M9iWXP6k/H3ugXWO80tXBPf8CbPl 8FD+LSNoNFG+uLGlTPD3410Rd/fdDmvsl1+VVOQcG/Tzk6vJmwl3lViKMxINtZiLihMBetBO YyECAAA= 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 directly call one of available ops for brightness setting. 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 | 12 +++++++++++- drivers/leds/leds.h | 10 ---------- include/linux/leds.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index a1f53aa..7d2512f 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -83,6 +83,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 = 0; if (led_cdev->flags & LED_BLINK_DISABLE) { led_cdev->delayed_set_value = LED_OFF; @@ -90,7 +91,16 @@ 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); + 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 + ret = -ENOTSUPP; + 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 8e252a2..683a605 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 b47eff5..56d5069 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -158,7 +158,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