summaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds-lp5523.c
diff options
context:
space:
mode:
authorMilo(Woogyom) Kim <milo.kim@ti.com>2013-02-05 17:53:40 +0900
committerBryan Wu <cooloney@gmail.com>2013-02-06 15:59:26 -0800
commitf652480802b636f86e194f9680347676b655d856 (patch)
tree37b1673e85657841c7864e12bb807cc31647f6d0 /drivers/leds/leds-lp5523.c
parent1a9914855d2868112257dbc5771ddc6ebc9b2cab (diff)
downloadlinux-f652480802b636f86e194f9680347676b655d856.tar.bz2
leds-lp55xx: clean up init leds in lp5521/5523
To make LED initialization code simple, new function, _register_leds() is added at each driver. This patch is a preceding step for lp55xx common driver architecture. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds/leds-lp5523.c')
-rw-r--r--drivers/leds/leds-lp5523.c73
1 files changed, 44 insertions, 29 deletions
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index ddb482aebe14..f5e893289816 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -896,6 +896,46 @@ static int lp5523_init_led(struct lp5523_led *led, struct device *dev,
return 0;
}
+static int lp5523_register_leds(struct lp5523_chip *chip, const char *name)
+{
+ struct lp5523_platform_data *pdata = chip->pdata;
+ struct i2c_client *client = chip->client;
+ int i;
+ int led;
+ int ret;
+
+ /* Initialize leds */
+ chip->num_channels = pdata->num_channels;
+ chip->num_leds = 0;
+ led = 0;
+ for (i = 0; i < pdata->num_channels; i++) {
+ /* Do not initialize channels that are not connected */
+ if (pdata->led_config[i].led_current == 0)
+ continue;
+
+ INIT_WORK(&chip->leds[led].brightness_work,
+ lp5523_led_brightness_work);
+
+ ret = lp5523_init_led(&chip->leds[led], &client->dev, i, pdata,
+ name);
+ if (ret) {
+ dev_err(&client->dev, "error initializing leds\n");
+ return ret;
+ }
+ chip->num_leds++;
+
+ chip->leds[led].id = led;
+ /* Set LED current */
+ lp5523_write(client,
+ LP5523_REG_LED_CURRENT_BASE + chip->leds[led].chan_nr,
+ chip->leds[led].led_current);
+
+ led++;
+ }
+
+ return 0;
+}
+
static int lp5523_init_device(struct lp5523_chip *chip)
{
struct lp5523_platform_data *pdata = chip->pdata;
@@ -938,7 +978,7 @@ static int lp5523_probe(struct i2c_client *client,
{
struct lp5523_chip *chip;
struct lp5523_platform_data *pdata;
- int ret, i, led;
+ int ret, i;
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
@@ -978,34 +1018,9 @@ static int lp5523_probe(struct i2c_client *client,
goto fail1;
}
- /* Initialize leds */
- chip->num_channels = pdata->num_channels;
- chip->num_leds = 0;
- led = 0;
- for (i = 0; i < pdata->num_channels; i++) {
- /* Do not initialize channels that are not connected */
- if (pdata->led_config[i].led_current == 0)
- continue;
-
- INIT_WORK(&chip->leds[led].brightness_work,
- lp5523_led_brightness_work);
-
- ret = lp5523_init_led(&chip->leds[led], &client->dev, i, pdata,
- id->name);
- if (ret) {
- dev_err(&client->dev, "error initializing leds\n");
- goto fail2;
- }
- chip->num_leds++;
-
- chip->leds[led].id = led;
- /* Set LED current */
- lp5523_write(client,
- LP5523_REG_LED_CURRENT_BASE + chip->leds[led].chan_nr,
- chip->leds[led].led_current);
-
- led++;
- }
+ ret = lp5523_register_leds(chip, id->name);
+ if (ret)
+ goto fail2;
ret = lp5523_register_sysfs(client);
if (ret) {