leds: core: add OF variants of LED registering functions

These new functions allow passing an additional device_node argument
that will be internally set for created LED device. Thanks to this LED
core code and triggers will be able to access DT node for reading extra
info.

The easiest solution for achieving this was reworking old functions to
more generic ones & adding simple defines for API compatibility.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index f2b0a80a62b46712a17e642efebd148ea2c99537..b0e2d55acbd6f43909cb3c84e64ba5acce794070 100644 (file)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -244,11 +244,14 @@ static int led_classdev_next_name(const char *init_name, char *name,
 }
 
 /**
- * led_classdev_register - register a new object of led_classdev class.
- * @parent: The device to register.
+ * of_led_classdev_register - register a new object of led_classdev class.
+ *
+ * @parent: parent of LED device
  * @led_cdev: the led_classdev structure for this device.
+ * @np: DT node describing this LED
  */
-int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
+int of_led_classdev_register(struct device *parent, struct device_node *np,
+                           struct led_classdev *led_cdev)
 {
        char name[LED_MAX_NAME_SIZE];
        int ret;
@@ -261,6 +264,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
                                led_cdev, led_cdev->groups, "%s", name);
        if (IS_ERR(led_cdev->dev))
                return PTR_ERR(led_cdev->dev);
+       led_cdev->dev->of_node = np;
 
        if (ret)
                dev_warn(parent, "Led %s renamed to %s due to name collision",
@@ -303,7 +307,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(led_classdev_register);
+EXPORT_SYMBOL_GPL(of_led_classdev_register);
 
 /**
  * led_classdev_unregister - unregisters a object of led_properties class.
@@ -348,12 +352,14 @@ static void devm_led_classdev_release(struct device *dev, void *res)
 }
 
 /**
- * devm_led_classdev_register - resource managed led_classdev_register()
- * @parent: The device to register.
+ * devm_of_led_classdev_register - resource managed led_classdev_register()
+ *
+ * @parent: parent of LED device
  * @led_cdev: the led_classdev structure for this device.
  */
-int devm_led_classdev_register(struct device *parent,
-                              struct led_classdev *led_cdev)
+int devm_of_led_classdev_register(struct device *parent,
+                                 struct device_node *np,
+                                 struct led_classdev *led_cdev)
 {
        struct led_classdev **dr;
        int rc;
@@ -362,7 +368,7 @@ int devm_led_classdev_register(struct device *parent,
        if (!dr)
                return -ENOMEM;
 
-       rc = led_classdev_register(parent, led_cdev);
+       rc = of_led_classdev_register(parent, np, led_cdev);
        if (rc) {
                devres_free(dr);
                return rc;
@@ -373,7 +379,7 @@ int devm_led_classdev_register(struct device *parent,
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(devm_led_classdev_register);
+EXPORT_SYMBOL_GPL(devm_of_led_classdev_register);
 
 static int devm_led_classdev_match(struct device *dev, void *res, void *data)
 {

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 38c0bd7ca1074af234d516275791d05f945ce1f0..64c56d454f7df9f864a5242ce4212df586f66886 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -122,10 +122,16 @@ struct led_classdev {
        struct mutex            led_access;
 };
 
-extern int led_classdev_register(struct device *parent,
-                                struct led_classdev *led_cdev);
-extern int devm_led_classdev_register(struct device *parent,
-                                     struct led_classdev *led_cdev);
+extern int of_led_classdev_register(struct device *parent,
+                                   struct device_node *np,
+                                   struct led_classdev *led_cdev);
+#define led_classdev_register(parent, led_cdev)                                \
+       of_led_classdev_register(parent, NULL, led_cdev)
+extern int devm_of_led_classdev_register(struct device *parent,
+                                        struct device_node *np,
+                                        struct led_classdev *led_cdev);
+#define devm_led_classdev_register(parent, led_cdev)                   \
+       devm_of_led_classdev_register(parent, NULL, led_cdev)
 extern void led_classdev_unregister(struct led_classdev *led_cdev);
 extern void devm_led_classdev_unregister(struct device *parent,
                                         struct led_classdev *led_cdev);