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

leds: 88pm860x: 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>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
This commit is contained in:
Andrew Lunn 2015-08-20 11:50:34 +02:00 committed by Jacek Anaszewski
parent d890389f89
commit 8824fefb59
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/leds/leds-88pm860x.c
View File

@ -16,7 +16,6 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/mfd/88pm860x.h> #include <linux/mfd/88pm860x.h>
#include <linux/module.h> #include <linux/module.h>
@ -33,7 +32,6 @@
struct pm860x_led { struct pm860x_led {
struct led_classdev cdev; struct led_classdev cdev;
struct i2c_client *i2c; struct i2c_client *i2c;
struct work_struct work;
struct pm860x_chip *chip; struct pm860x_chip *chip;
struct mutex lock; struct mutex lock;
char name[MFD_NAME_SIZE]; char name[MFD_NAME_SIZE];
@ -69,17 +67,18 @@ static int led_power_set(struct pm860x_chip *chip, int port, int on)
return ret; return ret;
} }
static void pm860x_led_work(struct work_struct *work) static int pm860x_led_set(struct led_classdev *cdev,
enum led_brightness value)
{ {
struct pm860x_led *led = container_of(cdev, struct pm860x_led, cdev);
struct pm860x_led *led;
struct pm860x_chip *chip; struct pm860x_chip *chip;
unsigned char buf[3]; unsigned char buf[3];
int ret; int ret;
led = container_of(work, struct pm860x_led, work);
chip = led->chip; chip = led->chip;
mutex_lock(&led->lock); mutex_lock(&led->lock);
led->brightness = value >> 3;
if ((led->current_brightness == 0) && led->brightness) { if ((led->current_brightness == 0) && led->brightness) {
led_power_set(chip, led->port, 1); led_power_set(chip, led->port, 1);
if (led->iset) { if (led->iset) {
@ -112,15 +111,8 @@ static void pm860x_led_work(struct work_struct *work)
dev_dbg(chip->dev, "Update LED. (reg:%d, brightness:%d)\n", dev_dbg(chip->dev, "Update LED. (reg:%d, brightness:%d)\n",
led->reg_control, led->brightness); led->reg_control, led->brightness);
mutex_unlock(&led->lock); mutex_unlock(&led->lock);
}
static void pm860x_led_set(struct led_classdev *cdev, return 0;
enum led_brightness value)
{
struct pm860x_led *data = container_of(cdev, struct pm860x_led, cdev);
data->brightness = value >> 3;
schedule_work(&data->work);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
@ -213,9 +205,8 @@ static int pm860x_led_probe(struct platform_device *pdev)
data->current_brightness = 0; data->current_brightness = 0;
data->cdev.name = data->name; data->cdev.name = data->name;
data->cdev.brightness_set = pm860x_led_set; data->cdev.brightness_set_blocking = pm860x_led_set;
mutex_init(&data->lock); mutex_init(&data->lock);
INIT_WORK(&data->work, pm860x_led_work);
ret = led_classdev_register(chip->dev, &data->cdev); ret = led_classdev_register(chip->dev, &data->cdev);
if (ret < 0) { if (ret < 0) {