leds: change existing triggers to use activated flag
Change existing triggers backlight, gpio, and heartbeat to use the new ->activated flag to set activate successful status in their activate routines and check it in their deactivate routines to do cleanup. Signed-off-by: Shuah Khan <shuahkhan@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Bryan Wu <bryan.wu@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b00961824a
commit
03c091e5b7
|
@ -120,6 +120,7 @@ static void bl_trig_activate(struct led_classdev *led)
|
||||||
ret = fb_register_client(&n->notifier);
|
ret = fb_register_client(&n->notifier);
|
||||||
if (ret)
|
if (ret)
|
||||||
dev_err(led->dev, "unable to register backlight trigger\n");
|
dev_err(led->dev, "unable to register backlight trigger\n");
|
||||||
|
led->activated = true;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -133,10 +134,11 @@ static void bl_trig_deactivate(struct led_classdev *led)
|
||||||
struct bl_trig_notifier *n =
|
struct bl_trig_notifier *n =
|
||||||
(struct bl_trig_notifier *) led->trigger_data;
|
(struct bl_trig_notifier *) led->trigger_data;
|
||||||
|
|
||||||
if (n) {
|
if (led->activated) {
|
||||||
device_remove_file(led->dev, &dev_attr_inverted);
|
device_remove_file(led->dev, &dev_attr_inverted);
|
||||||
fb_unregister_client(&n->notifier);
|
fb_unregister_client(&n->notifier);
|
||||||
kfree(n);
|
kfree(n);
|
||||||
|
led->activated = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -200,6 +200,7 @@ static void gpio_trig_activate(struct led_classdev *led)
|
||||||
gpio_data->led = led;
|
gpio_data->led = led;
|
||||||
led->trigger_data = gpio_data;
|
led->trigger_data = gpio_data;
|
||||||
INIT_WORK(&gpio_data->work, gpio_trig_work);
|
INIT_WORK(&gpio_data->work, gpio_trig_work);
|
||||||
|
led->activated = true;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -217,7 +218,7 @@ static void gpio_trig_deactivate(struct led_classdev *led)
|
||||||
{
|
{
|
||||||
struct gpio_trig_data *gpio_data = led->trigger_data;
|
struct gpio_trig_data *gpio_data = led->trigger_data;
|
||||||
|
|
||||||
if (gpio_data) {
|
if (led->activated) {
|
||||||
device_remove_file(led->dev, &dev_attr_gpio);
|
device_remove_file(led->dev, &dev_attr_gpio);
|
||||||
device_remove_file(led->dev, &dev_attr_inverted);
|
device_remove_file(led->dev, &dev_attr_inverted);
|
||||||
device_remove_file(led->dev, &dev_attr_desired_brightness);
|
device_remove_file(led->dev, &dev_attr_desired_brightness);
|
||||||
|
@ -225,6 +226,7 @@ static void gpio_trig_deactivate(struct led_classdev *led)
|
||||||
if (gpio_data->gpio != 0)
|
if (gpio_data->gpio != 0)
|
||||||
free_irq(gpio_to_irq(gpio_data->gpio), led);
|
free_irq(gpio_to_irq(gpio_data->gpio), led);
|
||||||
kfree(gpio_data);
|
kfree(gpio_data);
|
||||||
|
led->activated = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,15 +83,17 @@ static void heartbeat_trig_activate(struct led_classdev *led_cdev)
|
||||||
led_heartbeat_function, (unsigned long) led_cdev);
|
led_heartbeat_function, (unsigned long) led_cdev);
|
||||||
heartbeat_data->phase = 0;
|
heartbeat_data->phase = 0;
|
||||||
led_heartbeat_function(heartbeat_data->timer.data);
|
led_heartbeat_function(heartbeat_data->timer.data);
|
||||||
|
led_cdev->activated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void heartbeat_trig_deactivate(struct led_classdev *led_cdev)
|
static void heartbeat_trig_deactivate(struct led_classdev *led_cdev)
|
||||||
{
|
{
|
||||||
struct heartbeat_trig_data *heartbeat_data = led_cdev->trigger_data;
|
struct heartbeat_trig_data *heartbeat_data = led_cdev->trigger_data;
|
||||||
|
|
||||||
if (heartbeat_data) {
|
if (led_cdev->activated) {
|
||||||
del_timer_sync(&heartbeat_data->timer);
|
del_timer_sync(&heartbeat_data->timer);
|
||||||
kfree(heartbeat_data);
|
kfree(heartbeat_data);
|
||||||
|
led_cdev->activated = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue