lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

leds-lp5521: modify the way of setting led device name

Browse Source 
Currently the led device name is fetched from the device_type in
I2C_BOARD_INFO which comes from the platform data.  This name is in turn
used to create an entry in sysfs.

If there exists two or more lp5521 on a particular platform, the
device_type in I2C_BOARD_INFO has to be the same, else lp5521 driver probe
wont be called and if used so, results in run time warning "cannot create
sysfs with same name" and hence a failure.

The name that is used to create sysfs entry is to be passed by the struct
led_platform_data.  Hence adding an element of type const char * and
change in lp5521 driver to use this name in creating the led device if
present else use the name obtained by I2C_BOARD_INFO.

Signed-off-by: Arun Murthy <arun.murthy@stericsson.com>
Acked-by: Samu Onkalo <samu.p.onkalo@nokia.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>
This commit is contained in:
Arun Murthy
2011-01-12 16:59:20 -08:00
committed by Linus Torvalds
parent d4e7ad03e8
commit 61a83932b8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/leds/leds-lp5521.c
View File

@@ -617,7 +617,8 @@ static int __init lp5521_init_led(struct lp5521_led *led,
return -EINVAL; return -EINVAL;
} }
snprintf(name, sizeof(name), "%s:channel%d", client->name, chan); snprintf(name, sizeof(name), "%s:channel%d",
pdata->label ?: client->name, chan);
led->cdev.brightness_set = lp5521_set_brightness; led->cdev.brightness_set = lp5521_set_brightness;
led->cdev.name = name; led->cdev.name = name;
res = led_classdev_register(dev, &led->cdev); res = led_classdev_register(dev, &led->cdev);

1
include/linux/leds-lp5521.h
View File

@@ -42,6 +42,7 @@ struct lp5521_platform_data {
int (*setup_resources)(void); int (*setup_resources)(void);
void (*release_resources)(void); void (*release_resources)(void);
void (*enable)(bool state); void (*enable)(bool state);
const char *label;
}; };
#endif /* __LINUX_LP5521_H */ #endif /* __LINUX_LP5521_H */