aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamu Onkalo <samu.p.onkalo@nokia.com>2011-01-12 16:59:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 08:03:05 -0800
commit278ad4fd0e7517f1d74b8fc1c8347cad34a09b02 (patch)
treefd168660d4938d61a7f04e6e112fcac8a401371a
parent125c7135251de3aea1429968aea9bdfcb6535fc7 (diff)
leds: leds-lp5523: modify the way of setting led device name
Currently all leds channels begins with string lp5523. Patch adds a possibility to provide name via platform data. This makes it possible to have several chips without overlapping sysfs names. Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com> Cc: Arun Murthy <arun.murthy@stericsson.com> Cc: Ilkka Koskinen <ilkka.koskinen@nokia.com> Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/leds/leds-lp5523.c3
-rw-r--r--include/linux/leds-lp5523.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 0cc4ead2fd8..6cb41607519 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -870,7 +870,8 @@ static int __init lp5523_init_led(struct lp5523_led *led, struct device *dev,
return -EINVAL;
}
- snprintf(name, 32, "lp5523:channel%d", chan);
+ snprintf(name, sizeof(name), "%s:channel%d",
+ pdata->label ?: "lp5523", chan);
led->cdev.name = name;
led->cdev.brightness_set = lp5523_set_brightness;
diff --git a/include/linux/leds-lp5523.h b/include/linux/leds-lp5523.h
index 796747637b8..2694289babd 100644
--- a/include/linux/leds-lp5523.h
+++ b/include/linux/leds-lp5523.h
@@ -42,6 +42,7 @@ struct lp5523_platform_data {
int (*setup_resources)(void);
void (*release_resources)(void);
void (*enable)(bool state);
+ const char *label;
};
#endif /* __LINUX_LP5523_H */