leds: da903x: Remove work queue

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 <andrew@lunn.ch>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>

diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index 952ba96..4752a2b 100644 (file)
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
-#include <linux/workqueue.h>
 #include <linux/mfd/da903x.h>
 #include <linux/slab.h>
 
@@ -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) {