Merge tag 'for-5.4/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/devic...

[linux.git] / drivers / leds / leds-an30259a.c

diff --git a/drivers/leds/leds-an30259a.c b/drivers/leds/leds-an30259a.c
index 1c1f0c8c56f4b85c953a1e8a80a89bd630518001..250dc9d6f63502d7145b0797f77780aadf04c87b 100644 (file)
--- a/drivers/leds/leds-an30259a.c
+++ b/drivers/leds/leds-an30259a.c
@@ -13,7 +13,6 @@
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
-#include <uapi/linux/uleds.h>
 
 #define AN30259A_MAX_LEDS 3
 
@@ -54,6 +53,8 @@
 #define AN30259A_BLINK_MAX_TIME 7500 /* ms */
 #define AN30259A_SLOPE_RESOLUTION 500 /* ms */
 
+#define AN30259A_NAME "an30259a"
+
 #define STATE_OFF 0
 #define STATE_KEEP 1
 #define STATE_ON 2
@@ -62,11 +63,11 @@ struct an30259a;
 
 struct an30259a_led {
        struct an30259a *chip;
+       struct fwnode_handle *fwnode;
        struct led_classdev cdev;
        u32 num;
        u32 default_state;
        bool sloping;
-       char label[LED_MAX_NAME_SIZE];
 };
 
 struct an30259a {
@@ -226,14 +227,7 @@ static int an30259a_dt_init(struct i2c_client *client,
 
                led->num = source;
                led->chip = chip;
-
-               if (of_property_read_string(child, "label", &str))
-                       snprintf(led->label, sizeof(led->label), "an30259a::");
-               else
-                       snprintf(led->label, sizeof(led->label), "an30259a:%s",
-                                str);
-
-               led->cdev.name = led->label;
+               led->fwnode = of_fwnode_handle(child);
 
                if (!of_property_read_string(child, "default-state", &str)) {
                        if (!strcmp(str, "on"))
@@ -312,13 +306,20 @@ static int an30259a_probe(struct i2c_client *client)
        chip->regmap = devm_regmap_init_i2c(client, &an30259a_regmap_config);
 
        for (i = 0; i < chip->num_leds; i++) {
+               struct led_init_data init_data = {};
+
                an30259a_init_default_state(&chip->leds[i]);
                chip->leds[i].cdev.brightness_set_blocking =
                        an30259a_brightness_set;
                chip->leds[i].cdev.blink_set = an30259a_blink_set;
 
-               err = devm_led_classdev_register(&client->dev,
-                                                &chip->leds[i].cdev);
+               init_data.fwnode = chip->leds[i].fwnode;
+               init_data.devicename = AN30259A_NAME;
+               init_data.default_label = ":";
+
+               err = devm_led_classdev_register_ext(&client->dev,
+                                                &chip->leds[i].cdev,
+                                                &init_data);
                if (err < 0)
                        goto exit;
        }
@@ -353,7 +354,7 @@ MODULE_DEVICE_TABLE(i2c, an30259a_id);
 
 static struct i2c_driver an30259a_driver = {
        .driver = {
-               .name = "leds-an32059a",
+               .name = "leds-an30259a",
                .of_match_table = of_match_ptr(an30259a_match_table),
        },
        .probe_new = an30259a_probe,
@@ -364,5 +365,5 @@ static struct i2c_driver an30259a_driver = {
 module_i2c_driver(an30259a_driver);
 
 MODULE_AUTHOR("Simon Shields <simon@lineageos.org>");
-MODULE_DESCRIPTION("AN32059A LED driver");
+MODULE_DESCRIPTION("AN30259A LED driver");
 MODULE_LICENSE("GPL v2");