diff options
| author | Marek Behún <marek.behun@nic.cz> | 2020-09-18 00:33:06 +0200 |
|---|---|---|
| committer | Pavel Machek <pavel@ucw.cz> | 2020-09-26 21:56:40 +0200 |
| commit | 6b8274de375b0632cfbda1081011f18738c15221 (patch) | |
| tree | a775b898a6566972ab816e86c0967b15f1214303 | |
| parent | d7d02b8af5bcaacec9e49993049f57faeb41689c (diff) | |
| download | kernel_replicant_linux-6b8274de375b0632cfbda1081011f18738c15221.tar.gz kernel_replicant_linux-6b8274de375b0632cfbda1081011f18738c15221.tar.bz2 kernel_replicant_linux-6b8274de375b0632cfbda1081011f18738c15221.zip | |
leds: mt6323: use struct led_init_data when registering
By using struct led_init_data when registering we do not need to parse
`label` DT property. Moreover `label` is deprecated and if it is not
present but `color` and `function` are, LED core will compose a name
from these properties instead.
Since init_data is passed with fwnode handle, we do not need to set
the of_node member of the newly created LED classdev.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: John Crispin <john@phrozen.org>
Cc: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
| -rw-r--r-- | drivers/leds/leds-mt6323.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/leds/leds-mt6323.c b/drivers/leds/leds-mt6323.c index 88deec9d0ef4..f61ad8448351 100644 --- a/drivers/leds/leds-mt6323.c +++ b/drivers/leds/leds-mt6323.c @@ -342,7 +342,6 @@ static int mt6323_led_set_dt_default(struct led_classdev *cdev, const char *state; int ret = 0; - led->cdev.name = of_get_property(np, "label", NULL) ? : np->name; led->cdev.default_trigger = of_get_property(np, "linux,default-trigger", NULL); @@ -402,6 +401,8 @@ static int mt6323_led_probe(struct platform_device *pdev) } for_each_available_child_of_node(np, child) { + struct led_init_data init_data = {}; + ret = of_property_read_u32(child, "reg", ®); if (ret) { dev_err(dev, "Failed to read led 'reg' property\n"); @@ -437,13 +438,15 @@ static int mt6323_led_probe(struct platform_device *pdev) goto put_child_node; } - ret = devm_led_classdev_register(dev, &leds->led[reg]->cdev); + init_data.fwnode = of_fwnode_handle(child); + + ret = devm_led_classdev_register_ext(dev, &leds->led[reg]->cdev, + &init_data); if (ret) { dev_err(&pdev->dev, "Failed to register LED: %d\n", ret); goto put_child_node; } - leds->led[reg]->cdev.dev->of_node = child; } return 0; |