From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752724AbbJGJRm (ORCPT ); Wed, 7 Oct 2015 05:17:42 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:55478 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752681AbbJGJLC (ORCPT ); Wed, 7 Oct 2015 05:11:02 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-1a-5614e1a3c6fb 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 01/10] leds: core: Add two new LED_BLINK_ flags Date: Wed, 07 Oct 2015 11:10:39 +0200 Message-id: <1444209048-29415-2-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+NgFupnluLIzCtJLcpLzFFi42I5/e+xoO7ihyJhBjcmSVmcv3uI2aL36nNG i8u75rBZbH2zjtHi7qmjbBaftnxjcmDzmHcy0GPnjs9MHn1bVjF6rFj9nd3j8ya5ANYoLpuU 1JzMstQifbsErow/Ny8yFdySqzh68CFbA+NkyS5GTg4JAROJi3OWMkPYYhIX7q1n62Lk4hAS mMUocXTZeVYI5yejxN575xhBqtgEDCV+vnjN1MXIwSEiICex80wlSA2zQDejxLLLXWA1wgJO EpO2bGcBsVkEVCV+f5rMAlLPK+AhMfebJYgpIaAgMWeSDUgFp4CnRGPvCSYQWwio4vCvL2wT GHkXMDKsYpRILUguKE5KzzXMSy3XK07MLS7NS9dLzs/dxAgOpmdSOxgP7nI/xCjAwajEw/vD WCRMiDWxrLgy9xCjBAezkgjvwntAId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rw3DjGECQmkJ5ak ZqemFqQWwWSZODilGhiZvnMpbs+Z172k+JGW8YU9P4OVdSSdqyvv2i47KWf4+XpDFsu/Cbsf NOxoPF6qWCl+3jlz3yPez5POzXqw4bZ39ot3tRvP2V6VqLX6VTvn1szfy/t0w3yjv33XyA/i 1vuz09NGj31rkGfTqvXf599Nfc2SeZu3Z1kI9wUmk20RDhdXFnH7Lk9QYinOSDTUYi4qTgQA 38dAeCICAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds LED_BLINK_BRIGHTNESS_CHANGE flag to indicate that blink brightness has changed, and LED_BLINK_DISABLE flag to indicate that blinking deactivation has been requested. In order to use the flags led_timer_function and set_brightness_delayed callbacks as well as led_set_brightness() function are being modified. The main goal of these modifications is to prepare set_brightness_work for extension of the scope of its responsibilities. Signed-off-by: Jacek Anaszewski Acked-by: Pavel Machek --- drivers/leds/led-core.c | 36 ++++++++++++++++++++++++++---------- include/linux/leds.h | 10 ++++++---- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index c1c3af0..1ba7fac 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -44,18 +44,18 @@ static void led_timer_function(unsigned long data) brightness = led_get_brightness(led_cdev); if (!brightness) { /* Time to switch the LED on. */ - if (led_cdev->delayed_set_value) { - led_cdev->blink_brightness = - led_cdev->delayed_set_value; - led_cdev->delayed_set_value = 0; - } brightness = led_cdev->blink_brightness; delay = led_cdev->blink_delay_on; } else { /* Store the current brightness value to be able * to restore it when the delay_off period is over. + * Do it only if there is no pending blink brightness + * change, to avoid overwriting the new value. */ - led_cdev->blink_brightness = brightness; + if (!(led_cdev->flags & LED_BLINK_BRIGHTNESS_CHANGE)) + led_cdev->blink_brightness = brightness; + else + led_cdev->flags &= ~LED_BLINK_BRIGHTNESS_CHANGE; brightness = LED_OFF; delay = led_cdev->blink_delay_off; } @@ -84,7 +84,11 @@ static void set_brightness_delayed(struct work_struct *ws) struct led_classdev *led_cdev = container_of(ws, struct led_classdev, set_brightness_work); - led_stop_software_blink(led_cdev); + if (led_cdev->flags & LED_BLINK_DISABLE) { + led_cdev->delayed_set_value = LED_OFF; + led_stop_software_blink(led_cdev); + led_cdev->flags &= ~LED_BLINK_DISABLE; + } led_set_brightness_async(led_cdev, led_cdev->delayed_set_value); } @@ -192,11 +196,23 @@ void led_set_brightness(struct led_classdev *led_cdev, { int ret = 0; - /* delay brightness if soft-blink is active */ + /* + * In case blinking is on delay brightness setting + * until the next timer tick. + */ if (led_cdev->blink_delay_on || led_cdev->blink_delay_off) { - led_cdev->delayed_set_value = brightness; - if (brightness == LED_OFF) + /* + * If we need to disable soft blinking delegate this to the + * work queue task to avoid problems in case we are called + * from hard irq context. + */ + if (brightness == LED_OFF) { + led_cdev->flags |= LED_BLINK_DISABLE; schedule_work(&led_cdev->set_brightness_work); + } else { + led_cdev->flags |= LED_BLINK_BRIGHTNESS_CHANGE; + led_cdev->blink_brightness = brightness; + } return; } diff --git a/include/linux/leds.h b/include/linux/leds.h index b122eea..84521e5 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -44,10 +44,12 @@ struct led_classdev { #define LED_BLINK_ONESHOT (1 << 17) #define LED_BLINK_ONESHOT_STOP (1 << 18) #define LED_BLINK_INVERT (1 << 19) -#define LED_SYSFS_DISABLE (1 << 20) -#define SET_BRIGHTNESS_ASYNC (1 << 21) -#define SET_BRIGHTNESS_SYNC (1 << 22) -#define LED_DEV_CAP_FLASH (1 << 23) +#define LED_BLINK_BRIGHTNESS_CHANGE (1 << 20) +#define LED_BLINK_DISABLE (1 << 21) +#define LED_SYSFS_DISABLE (1 << 22) +#define SET_BRIGHTNESS_ASYNC (1 << 23) +#define SET_BRIGHTNESS_SYNC (1 << 24) +#define LED_DEV_CAP_FLASH (1 << 25) /* Set LED brightness level */ /* Must not sleep, use a workqueue if needed */ -- 1.7.9.5