leds: core: Move LED core callbacks out of led-class.c

Since the API for controlling LED brightness and blinking is defined in
the LED core, move the related timer and work callbacks to the led-core.c,
and initialize them through a new led_core_init API.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Pavel Machek <pavel@ucw.cz>

1 files changed, 1 insertions, 68 deletions

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index ca51d58bed24..7385f98dd54b 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -102,70 +102,6 @@ static const struct attribute_group *led_groups[] = {
         NULL,
 };
 
-static void led_timer_function(unsigned long data)
-{
-        struct led_classdev *led_cdev = (void *)data;
-        unsigned long brightness;
-        unsigned long delay;
-
-        if (!led_cdev->blink_delay_on || !led_cdev->blink_delay_off) {
-                led_set_brightness_async(led_cdev, LED_OFF);
-                return;
-        }
-
-        if (led_cdev->flags & LED_BLINK_ONESHOT_STOP) {
-                led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
-                return;
-        }
-
-        brightness = led_get_brightness(led_cdev);
-        if (!brightness) {
-                /* Time to switch the LED on. */
-                if (led_cdev->delayed_set_value) {
-                        led_cdev->blink_brightness =
-                                        led_cdev->delayed_set_value;
-                        led_cdev->delayed_set_value = 0;
-                }
-                brightness = led_cdev->blink_brightness;
-                delay = led_cdev->blink_delay_on;
-        } else {
-                /* Store the current brightness value to be able
-                 * to restore it when the delay_off period is over.
-                 */
-                led_cdev->blink_brightness = brightness;
-                brightness = LED_OFF;
-                delay = led_cdev->blink_delay_off;
-        }
-
-        led_set_brightness_async(led_cdev, brightness);
-
-        /* Return in next iteration if led is in one-shot mode and we are in
-         * the final blink state so that the led is toggled each delay_on +
-         * delay_off milliseconds in worst case.
-         */
-        if (led_cdev->flags & LED_BLINK_ONESHOT) {
-                if (led_cdev->flags & LED_BLINK_INVERT) {
-                        if (brightness)
-                                led_cdev->flags |= LED_BLINK_ONESHOT_STOP;
-                } else {
-                        if (!brightness)
-                                led_cdev->flags |= LED_BLINK_ONESHOT_STOP;
-                }
-        }
-
-        mod_timer(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay));
-}
-
-static void set_brightness_delayed(struct work_struct *ws)
-{
-        struct led_classdev *led_cdev =
-                container_of(ws, struct led_classdev, set_brightness_work);
-
-        led_stop_software_blink(led_cdev);
-
-        led_set_brightness_async(led_cdev, led_cdev->delayed_set_value);
-}
-
 /**
  * led_classdev_suspend - suspend an led_classdev.
  * @led_cdev: the led_classdev to suspend.
@@ -283,10 +219,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 
         led_update_brightness(led_cdev);
 
-        INIT_WORK(&led_cdev->set_brightness_work, set_brightness_delayed);
-
-        setup_timer(&led_cdev->blink_timer, led_timer_function,
-                    (unsigned long)led_cdev);
+        led_init_core(led_cdev);
 
 #ifdef CONFIG_LEDS_TRIGGERS
         led_trigger_set_default(led_cdev);