leds-lm3530: remove LM3530_ALS_ZONE_REG code
authorKim, Milo <Milo.Kim@ti.com>
Fri, 23 Mar 2012 22:02:12 +0000 (15:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 23:58:35 +0000 (16:58 -0700)
LM3530_ALS_ZONE_REG is read-only register.
Writing this register is not necessary.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/leds/leds-lm3530.c

index a889311eead14791dc37cf75dea28c9a9f10b903..d70c87901661b024cfd8b67583ffe4ba5d979df4 100644 (file)
@@ -26,7 +26,6 @@
 #define LM3530_GEN_CONFIG              0x10
 #define LM3530_ALS_CONFIG              0x20
 #define LM3530_BRT_RAMP_RATE           0x30
-#define LM3530_ALS_ZONE_REG            0x40
 #define LM3530_ALS_IMP_SELECT          0x41
 #define LM3530_BRT_CTRL_REG            0xA0
 #define LM3530_ALS_ZB0_REG             0x60
@@ -38,7 +37,7 @@
 #define LM3530_ALS_Z2T_REG             0x72
 #define LM3530_ALS_Z3T_REG             0x73
 #define LM3530_ALS_Z4T_REG             0x74
-#define LM3530_REG_MAX                 15
+#define LM3530_REG_MAX                 14
 
 /* General Control Register */
 #define LM3530_EN_I2C_SHIFT            (0)
@@ -118,7 +117,6 @@ static const u8 lm3530_reg[LM3530_REG_MAX] = {
        LM3530_GEN_CONFIG,
        LM3530_ALS_CONFIG,
        LM3530_BRT_RAMP_RATE,
-       LM3530_ALS_ZONE_REG,
        LM3530_ALS_IMP_SELECT,
        LM3530_BRT_CTRL_REG,
        LM3530_ALS_ZB0_REG,
@@ -217,18 +215,17 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
        reg_val[0] = gen_config;        /* LM3530_GEN_CONFIG */
        reg_val[1] = als_config;        /* LM3530_ALS_CONFIG */
        reg_val[2] = brt_ramp;          /* LM3530_BRT_RAMP_RATE */
-       reg_val[3] = 0x00;              /* LM3530_ALS_ZONE_REG */
-       reg_val[4] = als_imp_sel;       /* LM3530_ALS_IMP_SELECT */
-       reg_val[5] = brightness;        /* LM3530_BRT_CTRL_REG */
-       reg_val[6] = zones[0];          /* LM3530_ALS_ZB0_REG */
-       reg_val[7] = zones[1];          /* LM3530_ALS_ZB1_REG */
-       reg_val[8] = zones[2];          /* LM3530_ALS_ZB2_REG */
-       reg_val[9] = zones[3];          /* LM3530_ALS_ZB3_REG */
-       reg_val[10] = LM3530_DEF_ZT_0;  /* LM3530_ALS_Z0T_REG */
-       reg_val[11] = LM3530_DEF_ZT_1;  /* LM3530_ALS_Z1T_REG */
-       reg_val[12] = LM3530_DEF_ZT_2;  /* LM3530_ALS_Z2T_REG */
-       reg_val[13] = LM3530_DEF_ZT_3;  /* LM3530_ALS_Z3T_REG */
-       reg_val[14] = LM3530_DEF_ZT_4;  /* LM3530_ALS_Z4T_REG */
+       reg_val[3] = als_imp_sel;       /* LM3530_ALS_IMP_SELECT */
+       reg_val[4] = brightness;        /* LM3530_BRT_CTRL_REG */
+       reg_val[5] = zones[0];          /* LM3530_ALS_ZB0_REG */
+       reg_val[6] = zones[1];          /* LM3530_ALS_ZB1_REG */
+       reg_val[7] = zones[2];          /* LM3530_ALS_ZB2_REG */
+       reg_val[8] = zones[3];          /* LM3530_ALS_ZB3_REG */
+       reg_val[9] = LM3530_DEF_ZT_0;   /* LM3530_ALS_Z0T_REG */
+       reg_val[10] = LM3530_DEF_ZT_1;  /* LM3530_ALS_Z1T_REG */
+       reg_val[11] = LM3530_DEF_ZT_2;  /* LM3530_ALS_Z2T_REG */
+       reg_val[12] = LM3530_DEF_ZT_3;  /* LM3530_ALS_Z3T_REG */
+       reg_val[13] = LM3530_DEF_ZT_4;  /* LM3530_ALS_Z4T_REG */
 
        if (!drvdata->enable) {
                ret = regulator_enable(drvdata->regulator);