OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

leds: blinkm: 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: Jan-Simon Moeller <dl9pf@gmx.de>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
This commit is contained in:
Andrew Lunn 2015-08-20 11:59:26 +02:00 committed by Jacek Anaszewski
parent cd042f0106
commit 7e1761b0ad
1 changed files with 17 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
drivers/leds/leds-blinkm.c
View File

@ -39,16 +39,9 @@ struct blinkm_led {
struct i2c_client *i2c_client; struct i2c_client *i2c_client;
struct led_classdev led_cdev; struct led_classdev led_cdev;
int id; int id;
atomic_t active;
};
struct blinkm_work {
struct blinkm_led *blinkm_led;
struct work_struct work;
}; };
#define cdev_to_blmled(c) container_of(c, struct blinkm_led, led_cdev) #define cdev_to_blmled(c) container_of(c, struct blinkm_led, led_cdev)
#define work_to_blmwork(c) container_of(c, struct blinkm_work, work)
struct blinkm_data { struct blinkm_data {
struct i2c_client *i2c_client; struct i2c_client *i2c_client;
@ -439,65 +432,30 @@ static int blinkm_transfer_hw(struct i2c_client *client, int cmd)
return 0; return 0;
} }
static void led_work(struct work_struct *work)
{
int ret;
struct blinkm_led *led;
struct blinkm_data *data;
struct blinkm_work *blm_work = work_to_blmwork(work);
led = blm_work->blinkm_led;
data = i2c_get_clientdata(led->i2c_client);
ret = blinkm_transfer_hw(led->i2c_client, BLM_GO_RGB);
atomic_dec(&led->active);
dev_dbg(&led->i2c_client->dev,
"# DONE # next_red = %d, next_green = %d,"
" next_blue = %d, active = %d\n",
data->next_red, data->next_green,
data->next_blue, atomic_read(&led->active));
kfree(blm_work);
}
static int blinkm_led_common_set(struct led_classdev *led_cdev, static int blinkm_led_common_set(struct led_classdev *led_cdev,
enum led_brightness value, int color) enum led_brightness value, int color)
{ {
/* led_brightness is 0, 127 or 255 - we just use it here as-is */ /* led_brightness is 0, 127 or 255 - we just use it here as-is */
struct blinkm_led *led = cdev_to_blmled(led_cdev); struct blinkm_led *led = cdev_to_blmled(led_cdev);
struct blinkm_data *data = i2c_get_clientdata(led->i2c_client); struct blinkm_data *data = i2c_get_clientdata(led->i2c_client);
struct blinkm_work *bl_work;
switch (color) { switch (color) {
case RED: case RED:
/* bail out if there's no change */ /* bail out if there's no change */
if (data->next_red == (u8) value) if (data->next_red == (u8) value)
return 0; return 0;
/* we assume a quite fast sequence here ([off]->on->off)
* think of network led trigger - we cannot blink that fast, so
* in case we already have a off->on->off transition queued up,
* we refuse to queue up more.
* Revisit: fast-changing brightness. */
if (atomic_read(&led->active) > 1)
return 0;
data->next_red = (u8) value; data->next_red = (u8) value;
break; break;
case GREEN: case GREEN:
/* bail out if there's no change */ /* bail out if there's no change */
if (data->next_green == (u8) value) if (data->next_green == (u8) value)
return 0; return 0;
/* we assume a quite fast sequence here ([off]->on->off)
* Revisit: fast-changing brightness. */
if (atomic_read(&led->active) > 1)
return 0;
data->next_green = (u8) value; data->next_green = (u8) value;
break; break;
case BLUE: case BLUE:
/* bail out if there's no change */ /* bail out if there's no change */
if (data->next_blue == (u8) value) if (data->next_blue == (u8) value)
return 0; return 0;
/* we assume a quite fast sequence here ([off]->on->off)
* Revisit: fast-changing brightness. */
if (atomic_read(&led->active) > 1)
return 0;
data->next_blue = (u8) value; data->next_blue = (u8) value;
break; break;
@ -506,42 +464,31 @@ static int blinkm_led_common_set(struct led_classdev *led_cdev,
return -EINVAL; return -EINVAL;
} }
bl_work = kzalloc(sizeof(*bl_work), GFP_ATOMIC); blinkm_transfer_hw(led->i2c_client, BLM_GO_RGB);
if (!bl_work)
return -ENOMEM;
atomic_inc(&led->active);
dev_dbg(&led->i2c_client->dev, dev_dbg(&led->i2c_client->dev,
"#TO_SCHED# next_red = %d, next_green = %d," "# DONE # next_red = %d, next_green = %d,"
" next_blue = %d, active = %d\n", " next_blue = %d\n",
data->next_red, data->next_green, data->next_red, data->next_green,
data->next_blue, atomic_read(&led->active)); data->next_blue);
/* a fresh work _item_ for each change */
bl_work->blinkm_led = led;
INIT_WORK(&bl_work->work, led_work);
/* queue work in own queue for easy sync on exit*/
schedule_work(&bl_work->work);
return 0; return 0;
} }
static void blinkm_led_red_set(struct led_classdev *led_cdev, static int blinkm_led_red_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
blinkm_led_common_set(led_cdev, value, RED); return blinkm_led_common_set(led_cdev, value, RED);
} }
static void blinkm_led_green_set(struct led_classdev *led_cdev, static int blinkm_led_green_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
blinkm_led_common_set(led_cdev, value, GREEN); return blinkm_led_common_set(led_cdev, value, GREEN);
} }
static void blinkm_led_blue_set(struct led_classdev *led_cdev, static int blinkm_led_blue_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
blinkm_led_common_set(led_cdev, value, BLUE); return blinkm_led_common_set(led_cdev, value, BLUE);
} }
static void blinkm_init_hw(struct i2c_client *client) static void blinkm_init_hw(struct i2c_client *client)
@ -669,7 +616,6 @@ static int blinkm_probe(struct i2c_client *client,
led[i]->id = i; led[i]->id = i;
led[i]->led_cdev.max_brightness = 255; led[i]->led_cdev.max_brightness = 255;
led[i]->led_cdev.flags = LED_CORE_SUSPENDRESUME; led[i]->led_cdev.flags = LED_CORE_SUSPENDRESUME;
atomic_set(&led[i]->active, 0);
switch (i) { switch (i) {
case RED: case RED:
snprintf(blinkm_led_name, sizeof(blinkm_led_name), snprintf(blinkm_led_name, sizeof(blinkm_led_name),
@ -677,7 +623,8 @@ static int blinkm_probe(struct i2c_client *client,
client->adapter->nr, client->adapter->nr,
client->addr); client->addr);
led[i]->led_cdev.name = blinkm_led_name; led[i]->led_cdev.name = blinkm_led_name;
led[i]->led_cdev.brightness_set = blinkm_led_red_set; led[i]->led_cdev.brightness_set_blocking =
blinkm_led_red_set;
err = led_classdev_register(&client->dev, err = led_classdev_register(&client->dev,
&led[i]->led_cdev); &led[i]->led_cdev);
if (err < 0) { if (err < 0) {
@ -693,7 +640,8 @@ static int blinkm_probe(struct i2c_client *client,
client->adapter->nr, client->adapter->nr,
client->addr); client->addr);
led[i]->led_cdev.name = blinkm_led_name; led[i]->led_cdev.name = blinkm_led_name;
led[i]->led_cdev.brightness_set = blinkm_led_green_set; led[i]->led_cdev.brightness_set_blocking =
blinkm_led_green_set;
err = led_classdev_register(&client->dev, err = led_classdev_register(&client->dev,
&led[i]->led_cdev); &led[i]->led_cdev);
if (err < 0) { if (err < 0) {
@ -709,7 +657,8 @@ static int blinkm_probe(struct i2c_client *client,
client->adapter->nr, client->adapter->nr,
client->addr); client->addr);
led[i]->led_cdev.name = blinkm_led_name; led[i]->led_cdev.name = blinkm_led_name;
led[i]->led_cdev.brightness_set = blinkm_led_blue_set; led[i]->led_cdev.brightness_set_blocking =
blinkm_led_blue_set;
err = led_classdev_register(&client->dev, err = led_classdev_register(&client->dev,
&led[i]->led_cdev); &led[i]->led_cdev);
if (err < 0) { if (err < 0) {
@ -746,10 +695,8 @@ static int blinkm_remove(struct i2c_client *client)
int i; int i;
/* make sure no workqueue entries are pending */ /* make sure no workqueue entries are pending */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++)
flush_scheduled_work();
led_classdev_unregister(&data->blinkm_leds[i].led_cdev); led_classdev_unregister(&data->blinkm_leds[i].led_cdev);
}
/* reset rgb */ /* reset rgb */
data->next_red = 0x00; data->next_red = 0x00;