openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

leds: adp5520: Remove work queue 

Now the core implements the work queue, remove it from the driver,
and switch to using brightness_set_blocking op.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
This commit is contained in:
Andrew Lunn 2015-08-20 15:54:57 +02:00 committed by Jacek Anaszewski
parent 8824fefb59
commit 64d44e5aed
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/leds/leds-adp5520.c
View File

@ -17,34 +17,24 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/workqueue.h>
#include <linux/mfd/adp5520.h> #include <linux/mfd/adp5520.h>
#include <linux/slab.h> #include <linux/slab.h>
struct adp5520_led { struct adp5520_led {
struct led_classdev cdev; struct led_classdev cdev;
struct work_struct work;
struct device *master; struct device *master;
enum led_brightness new_brightness;
int id; int id;
int flags; int flags;
}; };
static void adp5520_led_work(struct work_struct *work) static int adp5520_led_set(struct led_classdev *led_cdev,
{
struct adp5520_led *led = container_of(work, struct adp5520_led, work);
adp5520_write(led->master, ADP5520_LED1_CURRENT + led->id - 1,
led->new_brightness >> 2);
}
static void adp5520_led_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
struct adp5520_led *led; struct adp5520_led *led;
led = container_of(led_cdev, struct adp5520_led, cdev); led = container_of(led_cdev, struct adp5520_led, cdev);
led->new_brightness = value; return adp5520_write(led->master, ADP5520_LED1_CURRENT + led->id - 1,
schedule_work(&led->work); value >> 2);
} }
static int adp5520_led_setup(struct adp5520_led *led) static int adp5520_led_setup(struct adp5520_led *led)
@ -135,7 +125,7 @@ static int adp5520_led_probe(struct platform_device *pdev)
led_dat->cdev.name = cur_led->name; led_dat->cdev.name = cur_led->name;
led_dat->cdev.default_trigger = cur_led->default_trigger; led_dat->cdev.default_trigger = cur_led->default_trigger;
led_dat->cdev.brightness_set = adp5520_led_set; led_dat->cdev.brightness_set_blocking = adp5520_led_set;
led_dat->cdev.brightness = LED_OFF; led_dat->cdev.brightness = LED_OFF;
if (cur_led->flags & ADP5520_FLAG_LED_MASK) if (cur_led->flags & ADP5520_FLAG_LED_MASK)
@ -146,9 +136,6 @@ static int adp5520_led_probe(struct platform_device *pdev)
led_dat->id = led_dat->flags & ADP5520_FLAG_LED_MASK; led_dat->id = led_dat->flags & ADP5520_FLAG_LED_MASK;
led_dat->master = pdev->dev.parent; led_dat->master = pdev->dev.parent;
led_dat->new_brightness = LED_OFF;
INIT_WORK(&led_dat->work, adp5520_led_work);
ret = led_classdev_register(led_dat->master, &led_dat->cdev); ret = led_classdev_register(led_dat->master, &led_dat->cdev);
if (ret) { if (ret) {
@ -170,10 +157,8 @@ static int adp5520_led_probe(struct platform_device *pdev)
err: err:
if (i > 0) { if (i > 0) {
for (i = i - 1; i >= 0; i--) { for (i = i - 1; i >= 0; i--)
led_classdev_unregister(&led[i].cdev); led_classdev_unregister(&led[i].cdev);
cancel_work_sync(&led[i].work);
}
} }
return ret; return ret;
@ -192,7 +177,6 @@ static int adp5520_led_remove(struct platform_device *pdev)
for (i = 0; i < pdata->num_leds; i++) { for (i = 0; i < pdata->num_leds; i++) {
led_classdev_unregister(&led[i].cdev); led_classdev_unregister(&led[i].cdev);
cancel_work_sync(&led[i].work);
} }
return 0; return 0;