From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756634AbbIUObM (ORCPT ); Mon, 21 Sep 2015 10:31:12 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:38024 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756553AbbIUObJ (ORCPT ); Mon, 21 Sep 2015 10:31:09 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-69-560014ab0122 From: Jacek Anaszewski To: linux-leds@vger.kernel.org Cc: linux-kernel@vger.kernel.org, andrew@lunn.ch, sakari.ailus@linux.intel.com, Jacek Anaszewski , Ingi Kim Subject: [PATCH 5/5] leds: ktd2692: Remove work queue Date: Mon, 21 Sep 2015 16:29:30 +0200 Message-id: <1442845770-17800-6-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1442845770-17800-1-git-send-email-j.anaszewski@samsung.com> References: <1442845770-17800-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupiluLIzCtJLcpLzFFi42I5/e+xgO5qEYYwg4bvOhbn7x5itthx8wub Re/V54wWl3fNYbPY+mYdo8WnLd+YHNg85p0M9Ni54zOTR9+WVYwenzfJBbBEcdmkpOZklqUW 6dslcGVMmdTDWHBUumLiw17WBsat4l2MnBwSAiYSe6YsZoOwxSQu3FsPZHNxCAksZZQ4uWQR I0hCSOAno0TLdn4Qm03AUOLni9dMXYwcHCICchI7z1SC1DMLzGeU2PB+PdggYQFTiQP/3rCA 2CwCqhK9V3+CxXkFPCT2z3zHDNIrIaAgMWeSDUiYU8BTYta1bqhVHhLzDk5lmsDIu4CRYRWj RGpBckFxUnquYV5quV5xYm5xaV66XnJ+7iZGcAg9k9rBeHCX+yFGAQ5GJR5eB4H/oUKsiWXF lbmHGCU4mJVEeI/zM4QJ8aYkVlalFuXHF5XmpBYfYpTmYFES55Vd+SxUSCA9sSQ1OzW1ILUI JsvEwSnVwGjGpOy6gW/zTJ47qW2Wjk/6n5244385v6Lp9Be3x76lQZMfLuFXjvZn3bpb6XaZ dszJqgmHX/9Xu/Sxwf0K20Ibx5/dviISvV/Yqrg92y0MW6ZX8Yc/T7zem8Gx+qtGaUverfYt qoGPk/YLr62/pCu/OiWe+8AtpU23Z2R4bKl7GhB3T3DpDCWW4oxEQy3mouJEAG6tj04dAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now the core implements the work queue, remove it from the drivers, and switch to using brightness_set_blocking op. Signed-off-by: Jacek Anaszewski Cc: Ingi Kim --- drivers/leds/leds-ktd2692.c | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c index 4c14bed..d70af1a 100644 --- a/drivers/leds/leds-ktd2692.c +++ b/drivers/leds/leds-ktd2692.c @@ -18,7 +18,6 @@ #include #include #include -#include /* Value related the movie mode */ #define KTD2692_MOVIE_MODE_CURRENT_LEVELS 16 @@ -82,7 +81,6 @@ struct ktd2692_context { /* secures access to the device */ struct mutex lock; struct regulator *regulator; - struct work_struct work_brightness_set; struct gpio_desc *aux_gpio; struct gpio_desc *ctrl_gpio; @@ -158,9 +156,12 @@ static void ktd2692_expresswire_write(struct ktd2692_context *led, u8 value) ktd2692_expresswire_end(led); } -static void ktd2692_brightness_set(struct ktd2692_context *led, - enum led_brightness brightness) +static int ktd2692_led_brightness_set(struct led_classdev *led_cdev, + enum led_brightness brightness) { + struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev); + struct ktd2692_context *led = fled_cdev_to_led(fled_cdev); + mutex_lock(&led->lock); if (brightness == LED_OFF) { @@ -174,33 +175,6 @@ static void ktd2692_brightness_set(struct ktd2692_context *led, ktd2692_expresswire_write(led, led->mode | KTD2692_REG_MODE_BASE); mutex_unlock(&led->lock); -} - -static void ktd2692_brightness_set_work(struct work_struct *work) -{ - struct ktd2692_context *led = - container_of(work, struct ktd2692_context, work_brightness_set); - - ktd2692_brightness_set(led, led->torch_brightness); -} - -static void ktd2692_led_brightness_set(struct led_classdev *led_cdev, - enum led_brightness brightness) -{ - struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev); - struct ktd2692_context *led = fled_cdev_to_led(fled_cdev); - - led->torch_brightness = brightness; - schedule_work(&led->work_brightness_set); -} - -static int ktd2692_led_brightness_set_sync(struct led_classdev *led_cdev, - enum led_brightness brightness) -{ - struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev); - struct ktd2692_context *led = fled_cdev_to_led(fled_cdev); - - ktd2692_brightness_set(led, brightness); return 0; } @@ -381,12 +355,10 @@ static int ktd2692_probe(struct platform_device *pdev) fled_cdev->ops = &flash_ops; led_cdev->max_brightness = led_cfg.max_brightness; - led_cdev->brightness_set = ktd2692_led_brightness_set; - led_cdev->brightness_set_blocking = ktd2692_led_brightness_set_sync; + led_cdev->brightness_set_blocking = ktd2692_led_brightness_set; led_cdev->flags |= LED_CORE_SUSPENDRESUME | LED_DEV_CAP_FLASH; mutex_init(&led->lock); - INIT_WORK(&led->work_brightness_set, ktd2692_brightness_set_work); platform_set_drvdata(pdev, led); @@ -408,7 +380,6 @@ static int ktd2692_remove(struct platform_device *pdev) int ret; led_classdev_flash_unregister(&led->fled_cdev); - cancel_work_sync(&led->work_brightness_set); if (led->regulator) { ret = regulator_disable(led->regulator); -- 1.7.9.5