leds-lp55xx: code refactoring on selftest function

 LP5521 and LP5523 have a selftest function which is run via the sysfs.
 Use lp55xx driver data and R/W functions rather than lp5521/5523 private data
 and functions.
 Additionally, if-statements are changed for code simplicity.
 Unused functions, lp5521/5523_read() are removed.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index abc3313..1f6d9c7 100644 (file)
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -168,18 +168,6 @@ static inline int lp5521_write(struct i2c_client *client, u8 reg, u8 value)
        return i2c_smbus_write_byte_data(client, reg, value);
 }
 
-static int lp5521_read(struct i2c_client *client, u8 reg, u8 *buf)
-{
-       s32 ret;
-
-       ret = i2c_smbus_read_byte_data(client, reg);
-       if (ret < 0)
-               return ret;
-
-       *buf = ret;
-       return 0;
-}
-
 static void lp5521_load_engine(struct lp55xx_chip *chip)
 {
        enum lp55xx_engine_index idx = chip->engine_idx;
@@ -378,19 +366,23 @@ static int lp5521_post_init_device(struct lp55xx_chip *chip)
        return 0;
 }
 
-static int lp5521_run_selftest(struct lp5521_chip *chip, char *buf)
+static int lp5521_run_selftest(struct lp55xx_chip *chip, char *buf)
 {
+       struct lp55xx_platform_data *pdata = chip->pdata;
        int ret;
        u8 status;
 
-       ret = lp5521_read(chip->client, LP5521_REG_STATUS, &status);
+       ret = lp55xx_read(chip, LP5521_REG_STATUS, &status);
        if (ret < 0)
                return ret;
 
+       if (pdata->clock_mode != LP55XX_CLOCK_EXT)
+               return 0;
+
        /* Check that ext clock is really in use if requested */
-       if (chip->pdata && chip->pdata->clock_mode == LP5521_CLOCK_EXT)
-               if  ((status & LP5521_EXT_CLK_USED) == 0)
-                       return -EIO;
+       if  ((status & LP5521_EXT_CLK_USED) == 0)
+               return -EIO;
+
        return 0;
 }
 
@@ -410,8 +402,8 @@ static ssize_t lp5521_selftest(struct device *dev,
                               struct device_attribute *attr,
                               char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lp5521_chip *chip = i2c_get_clientdata(client);
+       struct lp55xx_led *led = i2c_get_clientdata(to_i2c_client(dev));
+       struct lp55xx_chip *chip = led->chip;
        int ret;
 
        mutex_lock(&chip->lock);

diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 4192a1e..5770599 100644 (file)
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -178,17 +178,6 @@ static int lp5523_write(struct i2c_client *client, u8 reg, u8 value)
        return i2c_smbus_write_byte_data(client, reg, value);
 }
 
-static int lp5523_read(struct i2c_client *client, u8 reg, u8 *buf)
-{
-       s32 ret = i2c_smbus_read_byte_data(client, reg);
-
-       if (ret < 0)
-               return ret;
-
-       *buf = ret;
-       return 0;
-}
-
 static int lp5523_post_init_device(struct lp55xx_chip *chip)
 {
        int ret;
@@ -376,35 +365,35 @@ static ssize_t lp5523_selftest(struct device *dev,
                               struct device_attribute *attr,
                               char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lp5523_chip *chip = i2c_get_clientdata(client);
+       struct lp55xx_led *led = i2c_get_clientdata(to_i2c_client(dev));
+       struct lp55xx_chip *chip = led->chip;
+       struct lp55xx_platform_data *pdata = chip->pdata;
        int i, ret, pos = 0;
-       int led = 0;
        u8 status, adc, vdd;
 
        mutex_lock(&chip->lock);
 
-       ret = lp5523_read(chip->client, LP5523_REG_STATUS, &status);
+       ret = lp55xx_read(chip, LP5523_REG_STATUS, &status);
        if (ret < 0)
                goto fail;
 
        /* Check that ext clock is really in use if requested */
-       if ((chip->pdata) && (chip->pdata->clock_mode == LP5523_CLOCK_EXT))
+       if (pdata->clock_mode == LP55XX_CLOCK_EXT) {
                if  ((status & LP5523_EXT_CLK_USED) == 0)
                        goto fail;
+       }
 
        /* Measure VDD (i.e. VBAT) first (channel 16 corresponds to VDD) */
-       lp5523_write(chip->client, LP5523_REG_LED_TEST_CTRL,
-                                   LP5523_EN_LEDTEST | 16);
+       lp55xx_write(chip, LP5523_REG_LED_TEST_CTRL, LP5523_EN_LEDTEST | 16);
        usleep_range(3000, 6000); /* ADC conversion time is typically 2.7 ms */
-       ret = lp5523_read(chip->client, LP5523_REG_STATUS, &status);
+       ret = lp55xx_read(chip, LP5523_REG_STATUS, &status);
        if (ret < 0)
                goto fail;
 
        if (!(status & LP5523_LEDTEST_DONE))
                usleep_range(3000, 6000); /* Was not ready. Wait little bit */
 
-       ret = lp5523_read(chip->client, LP5523_REG_LED_TEST_ADC, &vdd);
+       ret = lp55xx_read(chip, LP5523_REG_LED_TEST_ADC, &vdd);
        if (ret < 0)
                goto fail;
 
@@ -412,41 +401,39 @@ static ssize_t lp5523_selftest(struct device *dev,
 
        for (i = 0; i < LP5523_MAX_LEDS; i++) {
                /* Skip non-existing channels */
-               if (chip->pdata->led_config[i].led_current == 0)
+               if (pdata->led_config[i].led_current == 0)
                        continue;
 
                /* Set default current */
-               lp5523_write(chip->client,
-                       LP5523_REG_LED_CURRENT_BASE + i,
-                       chip->pdata->led_config[i].led_current);
+               lp55xx_write(chip, LP5523_REG_LED_CURRENT_BASE + i,
+                       pdata->led_config[i].led_current);
 
-               lp5523_write(chip->client, LP5523_REG_LED_PWM_BASE + i, 0xff);
+               lp55xx_write(chip, LP5523_REG_LED_PWM_BASE + i, 0xff);
                /* let current stabilize 2 - 4ms before measurements start */
                usleep_range(2000, 4000);
-               lp5523_write(chip->client,
-                            LP5523_REG_LED_TEST_CTRL,
+               lp55xx_write(chip, LP5523_REG_LED_TEST_CTRL,
                             LP5523_EN_LEDTEST | i);
                /* ADC conversion time is 2.7 ms typically */
                usleep_range(3000, 6000);
-               ret = lp5523_read(chip->client, LP5523_REG_STATUS, &status);
+               ret = lp55xx_read(chip, LP5523_REG_STATUS, &status);
                if (ret < 0)
                        goto fail;
 
                if (!(status & LP5523_LEDTEST_DONE))
                        usleep_range(3000, 6000);/* Was not ready. Wait. */
-               ret = lp5523_read(chip->client, LP5523_REG_LED_TEST_ADC, &adc);
+
+               ret = lp55xx_read(chip, LP5523_REG_LED_TEST_ADC, &adc);
                if (ret < 0)
                        goto fail;
 
                if (adc >= vdd || adc < LP5523_ADC_SHORTCIRC_LIM)
                        pos += sprintf(buf + pos, "LED %d FAIL\n", i);
 
-               lp5523_write(chip->client, LP5523_REG_LED_PWM_BASE + i, 0x00);
+               lp55xx_write(chip, LP5523_REG_LED_PWM_BASE + i, 0x00);
 
                /* Restore current */
-               lp5523_write(chip->client,
-                       LP5523_REG_LED_CURRENT_BASE + i,
-                       chip->leds[led].led_current);
+               lp55xx_write(chip, LP5523_REG_LED_CURRENT_BASE + i,
+                       led->led_current);
                led++;
        }
        if (pos == 0)