Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754070AbbHTOuw (ORCPT ); Thu, 20 Aug 2015 10:50:52 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:41267 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753751AbbHTOrT (ORCPT ); Thu, 20 Aug 2015 10:47:19 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-fb-55d5e876a46c From: Jacek Anaszewski To: linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andrew Lunn , Jacek Anaszewski Subject: [PATCH/RFC v6 26/36] leds: da903x: Remove work queue Date: Thu, 20 Aug 2015 16:43:56 +0200 Message-id: <1440081846-11697-27-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1440081846-11697-1-git-send-email-j.anaszewski@samsung.com> References: <1440081846-11697-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDJMWRmVeSWpSXmKPExsVy+t9jAd2yF1dDDWbtk7U4f/cQs0Xv1eeM Fpd3zWGz2PpmHaMDi8fOHZ+ZPPq2rGL0+LxJLoA5issmJTUnsyy1SN8ugSvj4fTPLAXH5So2 NB5jamB8LdHFyMkhIWAicehbJwuELSZx4d56ti5GLg4hgaWMEqs/dUE5Pxkl7mycwwpSxSZg KPHzxWsmEFtEwEaid8YkMJtZwFfiyv4VzCC2sICtxJ9Dc8DiLAKqEqfWHAayOTh4BTwlzt5I AjElBBQk5kyyAangBIrOm/+VHcQWEvCQePF+C/MERt4FjAyrGCVSC5ILipPScw3zUsv1ihNz i0vz0vWS83M3MYLD5JnUDsaDu9wPMQpwMCrx8F4QvhoqxJpYVlyZe4hRgoNZSYT31jOgEG9K YmVValF+fFFpTmrxIUZpDhYlcV7ZDZtDhQTSE0tSs1NTC1KLYLJMHJxSDYzVtY++FdYcd1mx J2WvpqJ7ryBT0ZxlRxmK/r0+f2baJfEfFj/+82gafLznU3/nRmhu9LbNla3K71xWzJVUNbOe x66nnGf18sHsMvlN3avWTbiyZuaUFefv2eZ72HSE8nMwGbVduJe449FV0U0/jabMYGy1O7HZ lXPO/7VO+d/VuDdUZjCwfi5TYinOSDTUYi4qTgQAJr3ehA8CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4036 Lines: 125 From: Andrew Lunn Now the core implements the work queue, remove it from the drivers, and switch to using brightness_set_blocking op. Signed-off-by: Andrew Lunn Signed-off-by: Jacek Anaszewski --- drivers/leds/leds-da903x.c | 46 +++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c index 952ba96e..4752a2b 100644 --- a/drivers/leds/leds-da903x.c +++ b/drivers/leds/leds-da903x.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include @@ -33,9 +32,7 @@ struct da903x_led { struct led_classdev cdev; - struct work_struct work; struct device *master; - enum led_brightness new_brightness; int id; int flags; }; @@ -43,11 +40,13 @@ struct da903x_led { #define DA9030_LED_OFFSET(id) ((id) - DA9030_ID_LED_1) #define DA9034_LED_OFFSET(id) ((id) - DA9034_ID_LED_1) -static void da903x_led_work(struct work_struct *work) +static int da903x_led_set(struct led_classdev *led_cdev, + enum led_brightness value) { - struct da903x_led *led = container_of(work, struct da903x_led, work); + struct da903x_led *led = + container_of(led_cdev, struct da903x_led, cdev); uint8_t val; - int offset; + int offset, ret = -EINVAL; switch (led->id) { case DA9030_ID_LED_1: @@ -57,37 +56,31 @@ static void da903x_led_work(struct work_struct *work) case DA9030_ID_LED_PC: offset = DA9030_LED_OFFSET(led->id); val = led->flags & ~0x87; - val |= (led->new_brightness) ? 0x80 : 0; /* EN bit */ - val |= (0x7 - (led->new_brightness >> 5)) & 0x7; /* PWM<2:0> */ - da903x_write(led->master, DA9030_LED1_CONTROL + offset, val); + val |= value ? 0x80 : 0; /* EN bit */ + val |= (0x7 - (value >> 5)) & 0x7; /* PWM<2:0> */ + ret = da903x_write(led->master, DA9030_LED1_CONTROL + offset, + val); break; case DA9030_ID_VIBRA: val = led->flags & ~0x80; - val |= (led->new_brightness) ? 0x80 : 0; /* EN bit */ - da903x_write(led->master, DA9030_MISC_CONTROL_A, val); + val |= value ? 0x80 : 0; /* EN bit */ + ret = da903x_write(led->master, DA9030_MISC_CONTROL_A, val); break; case DA9034_ID_LED_1: case DA9034_ID_LED_2: offset = DA9034_LED_OFFSET(led->id); - val = (led->new_brightness * 0x5f / LED_FULL) & 0x7f; + val = (value * 0x5f / LED_FULL) & 0x7f; val |= (led->flags & DA9034_LED_RAMP) ? 0x80 : 0; - da903x_write(led->master, DA9034_LED1_CONTROL + offset, val); + ret = da903x_write(led->master, DA9034_LED1_CONTROL + offset, + val); break; case DA9034_ID_VIBRA: - val = led->new_brightness & 0xfe; - da903x_write(led->master, DA9034_VIBRA, val); + val = value & 0xfe; + ret = da903x_write(led->master, DA9034_VIBRA, val); break; } -} -static void da903x_led_set(struct led_classdev *led_cdev, - enum led_brightness value) -{ - struct da903x_led *led; - - led = container_of(led_cdev, struct da903x_led, cdev); - led->new_brightness = value; - schedule_work(&led->work); + return ret; } static int da903x_led_probe(struct platform_device *pdev) @@ -113,15 +106,12 @@ static int da903x_led_probe(struct platform_device *pdev) led->cdev.name = pdata->name; led->cdev.default_trigger = pdata->default_trigger; - led->cdev.brightness_set = da903x_led_set; + led->cdev.brightness_set_blocking = da903x_led_set; led->cdev.brightness = LED_OFF; led->id = id; led->flags = pdata->flags; led->master = pdev->dev.parent; - led->new_brightness = LED_OFF; - - INIT_WORK(&led->work, da903x_led_work); ret = led_classdev_register(led->master, &led->cdev); if (ret) { -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/