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>

diff --git a/Documentation/backlight/lp855x-driver.txt b/Documentation/backlight/lp855x-driver.txt
index 72e2a673f7740f170ac896480e0b8de21cabd536..1c732f0c675804b8e914c7f41cd7a862b2fc043d 100644 (file)
--- 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.
 * initial_brightness : Initial value of backlight brightness.
 * period_ns : Platform specific PWM period value. unit is nano.
             Only valid when brightness is pwm input mode.
-* load_new_rom_data :
-       0 : use default configuration data
-       1 : update values of eeprom or eprom registers on loading driver
 * size_program : Total size of lp855x_rom_data.
 * rom_data : List of new eeprom/eprom registers.
 
@@ -55,7 +52,6 @@ static struct lp855x_platform_data lp8552_pdata = {
        .name = "lcd-bl",
        .device_control = I2C_CONFIG(LP8552),
        .initial_brightness = INITIAL_BRT,
-       .load_new_rom_data = 1,
        .size_program = ARRAY_SIZE(lp8552_eeprom_arr),
        .rom_data = lp8552_eeprom_arr,
 };

diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index b94dc00cea3fd19b6f2aad5afc1c8f0345d9457d..f558f8f329e52c8f831232e948f6b85a3a5b4f12 100644 (file)
--- 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)
        if (ret)
                goto err;
 
-       if (pd->load_new_rom_data && pd->size_program) {
+       if (pd->size_program > 0) {
                for (i = 0; i < pd->size_program; i++) {
                        addr = pd->rom_data[i].addr;
                        val = pd->rom_data[i].val;

diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
index a4ed0bd65fdabf2958cc322f45b1f33bfa75dd5d..ea3200527dd302c6028d5f23d39f53415e89870c 100644 (file)
--- a/include/linux/platform_data/lp855x.h
+++ b/include/linux/platform_data/lp855x.h
@@ -115,9 +115,6 @@ struct lp855x_rom_data {
  * @initial_brightness : initial value of backlight brightness
  * @period_ns : platform specific pwm period value. unit is nano.
                Only valid when mode is PWM_BASED.
- * @load_new_rom_data :
-       0 : use default configuration data
-       1 : update values of eeprom or eprom registers on loading driver
  * @size_program : total size of lp855x_rom_data
  * @rom_data : list of new eeprom/eprom registers
  */
@@ -126,7 +123,6 @@ struct lp855x_platform_data {
        u8 device_control;
        u8 initial_brightness;
        unsigned int period_ns;
-       u8 load_new_rom_data;
        int size_program;
        struct lp855x_rom_data *rom_data;
 };