leds-lp55xx: clean up init_device() in lp5521/5523
To make _probe() simple, device initialization code is moved to _init_device() at each driver. This patch is a preceding step for lp55xx common driver architecture. leds-lp5521: When 'lp5521_init_device()' gets failed, error handling should be 'fail1' rather than 'fail2'. fail1: releasing platform resource and return code fail2: releasing allocated LED devices with handling 'fail1' The 'lp5521_init_device()' is called before creating LED devices. Thus, 'goto fail1' is proper error handler of this function. Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <cooloney@gmail.com>wifi-calibration
parent
8a4529a38d
commit
944f7b1ded
|
@ -687,6 +687,59 @@ static void lp5521_unregister_sysfs(struct i2c_client *client)
|
||||||
&lp5521_led_attribute_group);
|
&lp5521_led_attribute_group);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int lp5521_init_device(struct lp5521_chip *chip)
|
||||||
|
{
|
||||||
|
struct lp5521_platform_data *pdata = chip->pdata;
|
||||||
|
struct i2c_client *client = chip->client;
|
||||||
|
int ret;
|
||||||
|
u8 buf;
|
||||||
|
|
||||||
|
if (pdata->setup_resources) {
|
||||||
|
ret = pdata->setup_resources();
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pdata->enable) {
|
||||||
|
pdata->enable(0);
|
||||||
|
usleep_range(1000, 2000); /* Keep enable down at least 1ms */
|
||||||
|
pdata->enable(1);
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Make sure that the chip is reset by reading back the r channel
|
||||||
|
* current reg. This is dummy read is required on some platforms -
|
||||||
|
* otherwise further access to the R G B channels in the
|
||||||
|
* LP5521_REG_ENABLE register will not have any effect - strange!
|
||||||
|
*/
|
||||||
|
ret = lp5521_read(client, LP5521_REG_R_CURRENT, &buf);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(&client->dev, "error in resetting chip\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
if (buf != LP5521_REG_R_CURR_DEFAULT) {
|
||||||
|
dev_err(&client->dev,
|
||||||
|
"unexpected data in register (expected 0x%x got 0x%x)\n",
|
||||||
|
LP5521_REG_R_CURR_DEFAULT, buf);
|
||||||
|
ret = -EINVAL;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
usleep_range(10000, 20000);
|
||||||
|
|
||||||
|
ret = lp5521_detect(client);
|
||||||
|
if (ret)
|
||||||
|
dev_err(&client->dev, "Chip not found\n");
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int lp5521_init_led(struct lp5521_led *led,
|
static int lp5521_init_led(struct lp5521_led *led,
|
||||||
struct i2c_client *client,
|
struct i2c_client *client,
|
||||||
int chan, struct lp5521_platform_data *pdata)
|
int chan, struct lp5521_platform_data *pdata)
|
||||||
|
@ -742,7 +795,6 @@ static int lp5521_probe(struct i2c_client *client,
|
||||||
struct lp5521_chip *chip;
|
struct lp5521_chip *chip;
|
||||||
struct lp5521_platform_data *pdata;
|
struct lp5521_platform_data *pdata;
|
||||||
int ret, i, led;
|
int ret, i, led;
|
||||||
u8 buf;
|
|
||||||
|
|
||||||
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
|
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
|
||||||
if (!chip)
|
if (!chip)
|
||||||
|
@ -762,51 +814,9 @@ static int lp5521_probe(struct i2c_client *client,
|
||||||
|
|
||||||
chip->pdata = pdata;
|
chip->pdata = pdata;
|
||||||
|
|
||||||
if (pdata->setup_resources) {
|
ret = lp5521_init_device(chip);
|
||||||
ret = pdata->setup_resources();
|
if (ret)
|
||||||
if (ret < 0)
|
goto fail1;
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pdata->enable) {
|
|
||||||
pdata->enable(0);
|
|
||||||
usleep_range(1000, 2000); /* Keep enable down at least 1ms */
|
|
||||||
pdata->enable(1);
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Make sure that the chip is reset by reading back the r channel
|
|
||||||
* current reg. This is dummy read is required on some platforms -
|
|
||||||
* otherwise further access to the R G B channels in the
|
|
||||||
* LP5521_REG_ENABLE register will not have any effect - strange!
|
|
||||||
*/
|
|
||||||
ret = lp5521_read(client, LP5521_REG_R_CURRENT, &buf);
|
|
||||||
if (ret) {
|
|
||||||
dev_err(&client->dev, "error in resetting chip\n");
|
|
||||||
goto fail2;
|
|
||||||
}
|
|
||||||
if (buf != LP5521_REG_R_CURR_DEFAULT) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"unexpected data in register (expected 0x%x got 0x%x)\n",
|
|
||||||
LP5521_REG_R_CURR_DEFAULT, buf);
|
|
||||||
ret = -EINVAL;
|
|
||||||
goto fail2;
|
|
||||||
}
|
|
||||||
usleep_range(10000, 20000);
|
|
||||||
|
|
||||||
ret = lp5521_detect(client);
|
|
||||||
|
|
||||||
if (ret) {
|
|
||||||
dev_err(&client->dev, "Chip not found\n");
|
|
||||||
goto fail2;
|
|
||||||
}
|
|
||||||
|
|
||||||
dev_info(&client->dev, "%s programmable led chip found\n", id->name);
|
dev_info(&client->dev, "%s programmable led chip found\n", id->name);
|
||||||
|
|
||||||
|
|
|
@ -896,6 +896,33 @@ static int lp5523_init_led(struct lp5523_led *led, struct device *dev,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int lp5523_init_device(struct lp5523_chip *chip)
|
||||||
|
{
|
||||||
|
struct lp5523_platform_data *pdata = chip->pdata;
|
||||||
|
struct i2c_client *client = chip->client;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (pdata->setup_resources) {
|
||||||
|
ret = pdata->setup_resources();
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pdata->enable) {
|
||||||
|
pdata->enable(0);
|
||||||
|
usleep_range(1000, 2000); /* Keep enable down at least 1ms */
|
||||||
|
pdata->enable(1);
|
||||||
|
usleep_range(1000, 2000); /* 500us abs min. */
|
||||||
|
}
|
||||||
|
|
||||||
|
lp5523_write(client, LP5523_REG_RESET, 0xff);
|
||||||
|
usleep_range(10000, 20000); /*
|
||||||
|
* Exact value is not available. 10 - 20ms
|
||||||
|
* appears to be enough for reset.
|
||||||
|
*/
|
||||||
|
return lp5523_detect(client);
|
||||||
|
}
|
||||||
|
|
||||||
static int lp5523_probe(struct i2c_client *client,
|
static int lp5523_probe(struct i2c_client *client,
|
||||||
const struct i2c_device_id *id)
|
const struct i2c_device_id *id)
|
||||||
{
|
{
|
||||||
|
@ -921,25 +948,7 @@ static int lp5523_probe(struct i2c_client *client,
|
||||||
|
|
||||||
chip->pdata = pdata;
|
chip->pdata = pdata;
|
||||||
|
|
||||||
if (pdata->setup_resources) {
|
ret = lp5523_init_device(chip);
|
||||||
ret = pdata->setup_resources();
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pdata->enable) {
|
|
||||||
pdata->enable(0);
|
|
||||||
usleep_range(1000, 2000); /* Keep enable down at least 1ms */
|
|
||||||
pdata->enable(1);
|
|
||||||
usleep_range(1000, 2000); /* 500us abs min. */
|
|
||||||
}
|
|
||||||
|
|
||||||
lp5523_write(client, LP5523_REG_RESET, 0xff);
|
|
||||||
usleep_range(10000, 20000); /*
|
|
||||||
* Exact value is not available. 10 - 20ms
|
|
||||||
* appears to be enough for reset.
|
|
||||||
*/
|
|
||||||
ret = lp5523_detect(client);
|
|
||||||
if (ret)
|
if (ret)
|
||||||
goto fail1;
|
goto fail1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue