leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leds: lp8860: Remove work queue

Browse Source 
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>
Acked-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
This commit is contained in:
Andrew Lunn 2015-08-20 12:28:26 +02:00 committed by Jacek Anaszewski
parent 64998371e0
commit 7c4b10a2eb
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/leds/leds-lp8860.c
View File

@ -91,26 +91,22 @@
/** /**
* struct lp8860_led - * struct lp8860_led -
* @lock - Lock for reading/writing the device * @lock - Lock for reading/writing the device
* @work - Work item used to off load the brightness register writes
* @client - Pointer to the I2C client * @client - Pointer to the I2C client
* @led_dev - led class device pointer * @led_dev - led class device pointer
* @regmap - Devices register map * @regmap - Devices register map
* @eeprom_regmap - EEPROM register map * @eeprom_regmap - EEPROM register map
* @enable_gpio - VDDIO/EN gpio to enable communication interface * @enable_gpio - VDDIO/EN gpio to enable communication interface
* @regulator - LED supply regulator pointer * @regulator - LED supply regulator pointer
* @brightness - Current brightness value requested
* @label - LED label * @label - LED label
**/ **/
struct lp8860_led { struct lp8860_led {
struct mutex lock; struct mutex lock;
struct work_struct work;
struct i2c_client *client; struct i2c_client *client;
struct led_classdev led_dev; struct led_classdev led_dev;
struct regmap *regmap; struct regmap *regmap;
struct regmap *eeprom_regmap; struct regmap *eeprom_regmap;
struct gpio_desc *enable_gpio; struct gpio_desc *enable_gpio;
struct regulator *regulator; struct regulator *regulator;
enum led_brightness brightness;
const char *label; const char *label;
}; };
@ -212,11 +208,13 @@ out:
return ret; return ret;
} }
static void lp8860_led_brightness_work(struct work_struct *work) static int lp8860_brightness_set(struct led_classdev *led_cdev,
enum led_brightness brt_val)
{ {
struct lp8860_led *led = container_of(work, struct lp8860_led, work); struct lp8860_led *led =
container_of(led_cdev, struct lp8860_led, led_dev);
int disp_brightness = brt_val * 255;
int ret; int ret;
int disp_brightness = led->brightness * 255;
mutex_lock(&led->lock); mutex_lock(&led->lock);
@ -241,16 +239,7 @@ static void lp8860_led_brightness_work(struct work_struct *work)
} }
out: out:
mutex_unlock(&led->lock); mutex_unlock(&led->lock);
} return ret;
static void lp8860_brightness_set(struct led_classdev *led_cdev,
enum led_brightness brt_val)
{
struct lp8860_led *led =
container_of(led_cdev, struct lp8860_led, led_dev);
led->brightness = brt_val;
schedule_work(&led->work);
} }
static int lp8860_init(struct lp8860_led *led) static int lp8860_init(struct lp8860_led *led)
@ -406,10 +395,9 @@ static int lp8860_probe(struct i2c_client *client,
led->client = client; led->client = client;
led->led_dev.name = led->label; led->led_dev.name = led->label;
led->led_dev.max_brightness = LED_FULL; led->led_dev.max_brightness = LED_FULL;
led->led_dev.brightness_set = lp8860_brightness_set; led->led_dev.brightness_set_blocking = lp8860_brightness_set;
mutex_init(&led->lock); mutex_init(&led->lock);
INIT_WORK(&led->work, lp8860_led_brightness_work);
i2c_set_clientdata(client, led); i2c_set_clientdata(client, led);
@ -448,7 +436,6 @@ static int lp8860_remove(struct i2c_client *client)
int ret; int ret;
led_classdev_unregister(&led->led_dev); led_classdev_unregister(&led->led_dev);
cancel_work_sync(&led->work);
if (led->enable_gpio) if (led->enable_gpio)
gpiod_direction_output(led->enable_gpio, 0); gpiod_direction_output(led->enable_gpio, 0);