1 files changed, 33 insertions, 17 deletions

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 3782f31f06d2..33facd0c45d1 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -125,11 +125,22 @@ struct lp5521_chip {
         u8                      num_leds;
 };
 
-#define cdev_to_led(c)          container_of(c, struct lp5521_led, cdev)
-#define engine_to_lp5521(eng)   container_of((eng), struct lp5521_chip, \
-                                                engines[(eng)->id - 1])
-#define led_to_lp5521(led)      container_of((led), struct lp5521_chip, \
-                                                leds[(led)->id])
+static inline struct lp5521_led *cdev_to_led(struct led_classdev *cdev)
+{
+        return container_of(cdev, struct lp5521_led, cdev);
+}
+
+static inline struct lp5521_chip *engine_to_lp5521(struct lp5521_engine *engine)
+{
+        return container_of(engine, struct lp5521_chip,
+                            engines[engine->id - 1]);
+}
+
+static inline struct lp5521_chip *led_to_lp5521(struct lp5521_led *led)
+{
+        return container_of(led, struct lp5521_chip,
+                            leds[led->id]);
+}
 
 static void lp5521_led_brightness_work(struct work_struct *work);
 
@@ -185,14 +196,17 @@ static int lp5521_load_program(struct lp5521_engine *eng, const u8 *pattern)
 
         /* move current engine to direct mode and remember the state */
         ret = lp5521_set_engine_mode(eng, LP5521_CMD_DIRECT);
-        usleep_range(1000, 10000);
+        /* Mode change requires min 500 us delay. 1 - 2 ms  with margin */
+        usleep_range(1000, 2000);
         ret |= lp5521_read(client, LP5521_REG_OP_MODE, &mode);
 
         /* For loading, all the engines to load mode */
         lp5521_write(client, LP5521_REG_OP_MODE, LP5521_CMD_DIRECT);
-        usleep_range(1000, 10000);
+        /* Mode change requires min 500 us delay. 1 - 2 ms  with margin */
+        usleep_range(1000, 2000);
         lp5521_write(client, LP5521_REG_OP_MODE, LP5521_CMD_LOAD);
-        usleep_range(1000, 10000);
+        /* Mode change requires min 500 us delay. 1 - 2 ms  with margin */
+        usleep_range(1000, 2000);
 
         addr = LP5521_PROG_MEM_BASE + eng->prog_page * LP5521_PROG_MEM_SIZE;
         i2c_smbus_write_i2c_block_data(client,
@@ -231,10 +245,6 @@ static int lp5521_configure(struct i2c_client *client,
 
         lp5521_init_engine(chip, attr_group);
 
-        lp5521_write(client, LP5521_REG_RESET, 0xff);
-
-        usleep_range(10000, 20000);
-
         /* Set all PWMs to direct control mode */
         ret = lp5521_write(client, LP5521_REG_OP_MODE, 0x3F);
 
@@ -251,8 +261,8 @@ static int lp5521_configure(struct i2c_client *client,
         ret |= lp5521_write(client, LP5521_REG_ENABLE,
                         LP5521_MASTER_ENABLE | LP5521_LOGARITHMIC_PWM |
                         LP5521_EXEC_RUN);
-        /* enable takes 500us */
-        usleep_range(500, 20000);
+        /* enable takes 500us. 1 - 2 ms leaves some margin */
+        usleep_range(1000, 2000);
 
         return ret;
 }
@@ -305,7 +315,8 @@ static int lp5521_detect(struct i2c_client *client)
                         LP5521_MASTER_ENABLE | LP5521_LOGARITHMIC_PWM);
         if (ret)
                 return ret;
-        usleep_range(1000, 10000);
+        /* enable takes 500us. 1 - 2 ms leaves some margin */
+        usleep_range(1000, 2000);
         ret = lp5521_read(client, LP5521_REG_ENABLE, &buf);
         if (ret)
                 return ret;
@@ -693,11 +704,16 @@ static int lp5521_probe(struct i2c_client *client,
 
         if (pdata->enable) {
                 pdata->enable(0);
-                usleep_range(1000, 10000);
+                usleep_range(1000, 2000); /* Keep enable down at least 1ms */
                 pdata->enable(1);
-                usleep_range(1000, 10000); /* Spec says min 500us */
+                usleep_range(1000, 2000); /* 500us abs min. */
         }
 
+        lp5521_write(client, LP5521_REG_RESET, 0xff);
+        usleep_range(10000, 20000); /*
+                                     * Exact value is not available. 10 - 20ms
+                                     * appears to be enough for reset.
+                                     */
         ret = lp5521_detect(client);
 
         if (ret) {