leds: flash: Add devm_* functions to the flash class

Add the missing device managed API for registration and
unregistration for the LED flash class.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/leds/led-class-flash.c b/drivers/leds/led-class-flash.c
index 60c3de5c6b9f9bb4d7e83f2da3f2629a33cd281f..6eeb9effcf65305c2416b693d53bf9be993cb75f 100644 (file)
--- a/drivers/leds/led-class-flash.c
+++ b/drivers/leds/led-class-flash.c
@@ -327,6 +327,56 @@ void led_classdev_flash_unregister(struct led_classdev_flash *fled_cdev)
 }
 EXPORT_SYMBOL_GPL(led_classdev_flash_unregister);
 
+static void devm_led_classdev_flash_release(struct device *dev, void *res)
+{
+       led_classdev_flash_unregister(*(struct led_classdev_flash **)res);
+}
+
+int devm_led_classdev_flash_register_ext(struct device *parent,
+                                    struct led_classdev_flash *fled_cdev,
+                                    struct led_init_data *init_data)
+{
+       struct led_classdev_flash **dr;
+       int ret;
+
+       dr = devres_alloc(devm_led_classdev_flash_release, sizeof(*dr),
+                         GFP_KERNEL);
+       if (!dr)
+               return -ENOMEM;
+
+       ret = led_classdev_flash_register_ext(parent, fled_cdev, init_data);
+       if (ret) {
+               devres_free(dr);
+               return ret;
+       }
+
+       *dr = fled_cdev;
+       devres_add(parent, dr);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(devm_led_classdev_flash_register_ext);
+
+static int devm_led_classdev_flash_match(struct device *dev,
+                                             void *res, void *data)
+{
+       struct led_classdev_flash **p = res;
+
+       if (WARN_ON(!p || !*p))
+               return 0;
+
+       return *p == data;
+}
+
+void devm_led_classdev_flash_unregister(struct device *dev,
+                                       struct led_classdev_flash *fled_cdev)
+{
+       WARN_ON(devres_release(dev,
+                              devm_led_classdev_flash_release,
+                              devm_led_classdev_flash_match, fled_cdev));
+}
+EXPORT_SYMBOL_GPL(devm_led_classdev_flash_unregister);
+
 static void led_clamp_align(struct led_flash_setting *s)
 {
        u32 v, offset;

diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h
index 1bd83159fa4ce2dd1f4e06663b27e70662bddc48..21a3358a17318722d460884fda3625916e160f39 100644 (file)
--- a/include/linux/led-class-flash.h
+++ b/include/linux/led-class-flash.h
@@ -113,6 +113,20 @@ static inline int led_classdev_flash_register(struct device *parent,
  */
 void led_classdev_flash_unregister(struct led_classdev_flash *fled_cdev);
 
+int devm_led_classdev_flash_register_ext(struct device *parent,
+                                    struct led_classdev_flash *fled_cdev,
+                                    struct led_init_data *init_data);
+
+
+static inline int devm_led_classdev_flash_register(struct device *parent,
+                                    struct led_classdev_flash *fled_cdev)
+{
+       return devm_led_classdev_flash_register_ext(parent, fled_cdev, NULL);
+}
+
+void devm_led_classdev_flash_unregister(struct device *parent,
+                                       struct led_classdev_flash *fled_cdev);
+
 /**
  * led_set_flash_strobe - setup flash strobe
  * @fled_cdev: the flash LED to set strobe on