diff options
author | Kim, Milo <Milo.Kim@ti.com> | 2013-04-29 19:18:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:19 -0400 |
commit | c365e59d47b75c5f288f7e63d95dc0c9abcfe516 (patch) | |
tree | 93b77b3a538b27797ab5bbd50f5c462b8154dec1 | |
parent | 98e35be2badd7a499a001a0681d1904f8c56f3e6 (diff) |
backlight: lp855x: remove duplicate platform data
The 'load_new_rom_data' was used for checking whether new ROM data should
be updated or not.
However, we can decide it with 'size_program' data. If the size is
greater than 0, it means updating ROM area is required. Otherwise, the
default ROM data will be used. Therefore, this duplicate platform data
can be removed.
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-- | Documentation/backlight/lp855x-driver.txt | 4 | ||||
-rw-r--r-- | drivers/video/backlight/lp855x_bl.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/lp855x.h | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/Documentation/backlight/lp855x-driver.txt b/Documentation/backlight/lp855x-driver.txt index 72e2a673f774..1c732f0c6758 100644 --- a/Documentation/backlight/lp855x-driver.txt +++ b/Documentation/backlight/lp855x-driver.txt | |||
@@ -36,9 +36,6 @@ For supporting platform specific data, the lp855x platform data can be used. | |||
36 | * initial_brightness : Initial value of backlight brightness. | 36 | * initial_brightness : Initial value of backlight brightness. |
37 | * period_ns : Platform specific PWM period value. unit is nano. | 37 | * period_ns : Platform specific PWM period value. unit is nano. |
38 | Only valid when brightness is pwm input mode. | 38 | Only valid when brightness is pwm input mode. |
39 | * load_new_rom_data : | ||
40 | 0 : use default configuration data | ||
41 | 1 : update values of eeprom or eprom registers on loading driver | ||
42 | * size_program : Total size of lp855x_rom_data. | 39 | * size_program : Total size of lp855x_rom_data. |
43 | * rom_data : List of new eeprom/eprom registers. | 40 | * rom_data : List of new eeprom/eprom registers. |
44 | 41 | ||
@@ -55,7 +52,6 @@ static struct lp855x_platform_data lp8552_pdata = { | |||
55 | .name = "lcd-bl", | 52 | .name = "lcd-bl", |
56 | .device_control = I2C_CONFIG(LP8552), | 53 | .device_control = I2C_CONFIG(LP8552), |
57 | .initial_brightness = INITIAL_BRT, | 54 | .initial_brightness = INITIAL_BRT, |
58 | .load_new_rom_data = 1, | ||
59 | .size_program = ARRAY_SIZE(lp8552_eeprom_arr), | 55 | .size_program = ARRAY_SIZE(lp8552_eeprom_arr), |
60 | .rom_data = lp8552_eeprom_arr, | 56 | .rom_data = lp8552_eeprom_arr, |
61 | }; | 57 | }; |
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c index b94dc00cea3f..f558f8f329e5 100644 --- a/drivers/video/backlight/lp855x_bl.c +++ b/drivers/video/backlight/lp855x_bl.c | |||
@@ -192,7 +192,7 @@ static int lp855x_configure(struct lp855x *lp) | |||
192 | if (ret) | 192 | if (ret) |
193 | goto err; | 193 | goto err; |
194 | 194 | ||
195 | if (pd->load_new_rom_data && pd->size_program) { | 195 | if (pd->size_program > 0) { |
196 | for (i = 0; i < pd->size_program; i++) { | 196 | for (i = 0; i < pd->size_program; i++) { |
197 | addr = pd->rom_data[i].addr; | 197 | addr = pd->rom_data[i].addr; |
198 | val = pd->rom_data[i].val; | 198 | val = pd->rom_data[i].val; |
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h index a4ed0bd65fda..ea3200527dd3 100644 --- a/include/linux/platform_data/lp855x.h +++ b/include/linux/platform_data/lp855x.h | |||
@@ -115,9 +115,6 @@ struct lp855x_rom_data { | |||
115 | * @initial_brightness : initial value of backlight brightness | 115 | * @initial_brightness : initial value of backlight brightness |
116 | * @period_ns : platform specific pwm period value. unit is nano. | 116 | * @period_ns : platform specific pwm period value. unit is nano. |
117 | Only valid when mode is PWM_BASED. | 117 | Only valid when mode is PWM_BASED. |
118 | * @load_new_rom_data : | ||
119 | 0 : use default configuration data | ||
120 | 1 : update values of eeprom or eprom registers on loading driver | ||
121 | * @size_program : total size of lp855x_rom_data | 118 | * @size_program : total size of lp855x_rom_data |
122 | * @rom_data : list of new eeprom/eprom registers | 119 | * @rom_data : list of new eeprom/eprom registers |
123 | */ | 120 | */ |
@@ -126,7 +123,6 @@ struct lp855x_platform_data { | |||
126 | u8 device_control; | 123 | u8 device_control; |
127 | u8 initial_brightness; | 124 | u8 initial_brightness; |
128 | unsigned int period_ns; | 125 | unsigned int period_ns; |
129 | u8 load_new_rom_data; | ||
130 | int size_program; | 126 | int size_program; |
131 | struct lp855x_rom_data *rom_data; | 127 | struct lp855x_rom_data *rom_data; |
132 | }; | 128 | }; |