Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem update from Bryan Wu:
 "Basically this cycle is mostly cleanup for LED subsystem"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: s3c24xx: Remove hardware.h inclusion
  leds: replace list_for_each with list_for_each_entry
  leds: kirkwood: Cleanup in header files
  leds: pwm: Remove a warning on non-DT platforms
  leds: leds-pwm: fix duty time overflow.
  leds: leds-mc13783: Remove unneeded mc13xxx_{un}lock
  leds: leds-mc13783: Remove duplicate field in platform data
  drivers: leds: leds-tca6507: check CONFIG_GPIOLIB whether defined for 'gpio_base'
  leds: lp5523: Support LED MUX configuration on running a pattern
  leds: lp5521/5523: Fix multiple engine usage bug
  LEDS: tca6507 - fix up some comments.
  LEDS: tca6507: add device-tree support for GPIO configuration.
  LEDS: tca6507 - fix bugs in parsing of device-tree configuration.

1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 3a0bc886a87a..4ade66a2d9d4 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -195,12 +195,26 @@ static void lp5523_load_engine_and_select_page(struct lp55xx_chip *chip)
         lp55xx_write(chip, LP5523_REG_PROG_PAGE_SEL, page_sel[idx]);
 }
 
-static void lp5523_stop_engine(struct lp55xx_chip *chip)
+static void lp5523_stop_all_engines(struct lp55xx_chip *chip)
 {
         lp55xx_write(chip, LP5523_REG_OP_MODE, 0);
         lp5523_wait_opmode_done();
 }
 
+static void lp5523_stop_engine(struct lp55xx_chip *chip)
+{
+        enum lp55xx_engine_index idx = chip->engine_idx;
+        u8 mask[] = {
+                [LP55XX_ENGINE_1] = LP5523_MODE_ENG1_M,
+                [LP55XX_ENGINE_2] = LP5523_MODE_ENG2_M,
+                [LP55XX_ENGINE_3] = LP5523_MODE_ENG3_M,
+        };
+
+        lp55xx_update_bits(chip, LP5523_REG_OP_MODE, mask[idx], 0);
+
+        lp5523_wait_opmode_done();
+}
+
 static void lp5523_turn_off_channels(struct lp55xx_chip *chip)
 {
         int i;
@@ -311,7 +325,7 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip)
         }
 
 out:
-        lp5523_stop_engine(chip);
+        lp5523_stop_all_engines(chip);
         return ret;
 }
 
@@ -782,7 +796,7 @@ static int lp5523_remove(struct i2c_client *client)
         struct lp55xx_led *led = i2c_get_clientdata(client);
         struct lp55xx_chip *chip = led->chip;
 
-        lp5523_stop_engine(chip);
+        lp5523_stop_all_engines(chip);
         lp55xx_unregister_sysfs(chip);
         lp55xx_unregister_leds(led, chip);
         lp55xx_deinit_device(chip);