aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds-lp5523.c
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2012-08-22 03:32:29 -0400
committerBryan Wu <bryan.wu@canonical.com>2012-09-11 06:32:41 -0400
commit94b43b677104e50b9f8dd75aacb3c69e16089a68 (patch)
tree991fa64dbabaa3eee5c0dd900a4bbe5ca0c0e3aa /drivers/leds/leds-lp5523.c
parent127aedc8ecae2628511533ddeb239e99e4bed5e8 (diff)
leds-lp5523: add channel name in the platform data
The name of each led channel is configurable. If the name is NULL, just use the channel id for making the channel name Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers/leds/leds-lp5523.c')
-rw-r--r--drivers/leds/leds-lp5523.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index fbc12acada95..9fd9a92ed916 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -846,10 +846,14 @@ static int __devinit lp5523_init_led(struct lp5523_led *led, struct device *dev,
846 return -EINVAL; 846 return -EINVAL;
847 } 847 }
848 848
849 snprintf(name, sizeof(name), "%s:channel%d", 849 if (pdata->led_config[chan].name) {
850 pdata->label ?: "lp5523", chan); 850 led->cdev.name = pdata->led_config[chan].name;
851 } else {
852 snprintf(name, sizeof(name), "%s:channel%d",
853 pdata->label ?: "lp5523", chan);
854 led->cdev.name = name;
855 }
851 856
852 led->cdev.name = name;
853 led->cdev.brightness_set = lp5523_set_brightness; 857 led->cdev.brightness_set = lp5523_set_brightness;
854 res = led_classdev_register(dev, &led->cdev); 858 res = led_classdev_register(dev, &led->cdev);
855 if (res < 0) { 859 if (res < 0) {