Merge tag 'char-misc-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / leds / leds.h

diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h
index 4238fbc31d3587923f95a61f5ba2b33e5cf74d92..db3f20da7221738920bf49bd35fbc13b1768e65d 100644 (file)
--- a/drivers/leds/leds.h
+++ b/drivers/leds/leds.h
@@ -16,29 +16,6 @@
 #include <linux/rwsem.h>
 #include <linux/leds.h>
 
-static inline void led_set_brightness_async(struct led_classdev *led_cdev,
-                                       enum led_brightness value)
-{
-       value = min(value, led_cdev->max_brightness);
-       led_cdev->brightness = value;
-
-       if (!(led_cdev->flags & LED_SUSPENDED))
-               led_cdev->brightness_set(led_cdev, value);
-}
-
-static inline int led_set_brightness_sync(struct led_classdev *led_cdev,
-                                       enum led_brightness value)
-{
-       int ret = 0;
-
-       led_cdev->brightness = min(value, led_cdev->max_brightness);
-
-       if (!(led_cdev->flags & LED_SUSPENDED))
-               ret = led_cdev->brightness_set_sync(led_cdev,
-                                               led_cdev->brightness);
-       return ret;
-}
-
 static inline int led_get_brightness(struct led_classdev *led_cdev)
 {
        return led_cdev->brightness;
@@ -46,6 +23,10 @@ static inline int led_get_brightness(struct led_classdev *led_cdev)
 
 void led_init_core(struct led_classdev *led_cdev);
 void led_stop_software_blink(struct led_classdev *led_cdev);
+void led_set_brightness_nopm(struct led_classdev *led_cdev,
+                               enum led_brightness value);
+void led_set_brightness_nosleep(struct led_classdev *led_cdev,
+                               enum led_brightness value);
 
 extern struct rw_semaphore leds_list_lock;
 extern struct list_head leds_list;