diff options
| -rw-r--r-- | drivers/leds/led-class.c | 1 | ||||
| -rw-r--r-- | drivers/leds/leds.h | 2 | ||||
| -rw-r--r-- | drivers/leds/trigger/ledtrig-timer.c | 20 |
3 files changed, 13 insertions, 10 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index a20752f56..b2c37e00d 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -209,6 +209,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) #ifdef CONFIG_LEDS_TRIGGERS led_trigger_set_default(led_cdev); + create_timer_files(led_cdev); #endif dev_dbg(parent, "Registered led device: %s\n", diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h index 771615cbc..1bb68a8aa 100644 --- a/drivers/leds/leds.h +++ b/drivers/leds/leds.h @@ -54,6 +54,8 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev) return led_cdev->trigger_data; } +void create_timer_files(struct led_classdev *led_cdev); + #else #define led_trigger_set_default(x) do {} while (0) #define led_trigger_set(x, y) do {} while (0) diff --git a/drivers/leds/trigger/ledtrig-timer.c b/drivers/leds/trigger/ledtrig-timer.c index 2afb6993e..0bd67a9da 100644 --- a/drivers/leds/trigger/ledtrig-timer.c +++ b/drivers/leds/trigger/ledtrig-timer.c @@ -71,35 +71,35 @@ static ssize_t led_delay_off_store(struct device *dev, static DEVICE_ATTR(delay_on, 0644, led_delay_on_show, led_delay_on_store); static DEVICE_ATTR(delay_off, 0644, led_delay_off_show, led_delay_off_store); -static void timer_trig_activate(struct led_classdev *led_cdev) +void create_timer_files(struct led_classdev *led_cdev) { int rc; - led_cdev->trigger_data = NULL; - rc = device_create_file(led_cdev->dev, &dev_attr_delay_on); if (rc) return; rc = device_create_file(led_cdev->dev, &dev_attr_delay_off); if (rc) goto err_out_delayon; + return; +err_out_delayon: + device_remove_file(led_cdev->dev, &dev_attr_delay_on); +} +EXPORT_SYMBOL_GPL(create_timer_files); + +static void timer_trig_activate(struct led_classdev *led_cdev) +{ + led_cdev->trigger_data = NULL; led_blink_set(led_cdev, &led_cdev->blink_delay_on, &led_cdev->blink_delay_off); led_cdev->activated = true; kobject_uevent(&led_cdev->dev->kobj,KOBJ_ADD); - - return; - -err_out_delayon: - device_remove_file(led_cdev->dev, &dev_attr_delay_on); } static void timer_trig_deactivate(struct led_classdev *led_cdev) { if (led_cdev->activated) { - device_remove_file(led_cdev->dev, &dev_attr_delay_on); - device_remove_file(led_cdev->dev, &dev_attr_delay_off); led_cdev->activated = false; } |