aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2013-04-29 19:18:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 21:28:18 -0400
commit600ffd33d09e3803d81607d3404a8cad709160e4 (patch)
tree123ac4b96e5447b669fc3783e2cca5351919f23c
parenteb39ad2558c75b43ea21a2578088ab8d63a79d92 (diff)
backlight: lp855x: convert a type of device name
Configurable data, backlight device name is set to constant character type. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/backlight/lp855x_bl.c2
-rw-r--r--include/linux/platform_data/lp855x.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index c98bdbfdc697..df937ce5c2ec 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -273,7 +273,7 @@ static int lp855x_backlight_register(struct lp855x *lp)
273 struct backlight_device *bl; 273 struct backlight_device *bl;
274 struct backlight_properties props; 274 struct backlight_properties props;
275 struct lp855x_platform_data *pdata = lp->pdata; 275 struct lp855x_platform_data *pdata = lp->pdata;
276 char *name = pdata->name ? : DEFAULT_BL_NAME; 276 const char *name = pdata->name ? : DEFAULT_BL_NAME;
277 277
278 props.type = BACKLIGHT_PLATFORM; 278 props.type = BACKLIGHT_PLATFORM;
279 props.max_brightness = MAX_BRIGHTNESS; 279 props.max_brightness = MAX_BRIGHTNESS;
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
index 20ee8b221dbd..d135939d392a 100644
--- a/include/linux/platform_data/lp855x.h
+++ b/include/linux/platform_data/lp855x.h
@@ -128,7 +128,7 @@ struct lp855x_rom_data {
128 * @rom_data : list of new eeprom/eprom registers 128 * @rom_data : list of new eeprom/eprom registers
129 */ 129 */
130struct lp855x_platform_data { 130struct lp855x_platform_data {
131 char *name; 131 const char *name;
132 enum lp855x_brightness_ctrl_mode mode; 132 enum lp855x_brightness_ctrl_mode mode;
133 u8 device_control; 133 u8 device_control;
134 int initial_brightness; 134 int initial_brightness;