leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leds: convert LP5523 LED driver to devm_kzalloc() and cleanup error exit path

Browse Source 
Cc: Mathias Nyman <mathias.nyman@nokia.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
This commit is contained in:
Bryan Wu 2012-07-04 11:44:18 +08:00
parent 983ce8840c
commit 94ca4bccac
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/leds/leds-lp5523.c
View File

@ -877,7 +877,7 @@ static int __devinit lp5523_probe(struct i2c_client *client,
struct lp5523_platform_data *pdata; struct lp5523_platform_data *pdata;
int ret, i, led; int ret, i, led;
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)
return -ENOMEM; return -ENOMEM;
@ -888,8 +888,7 @@ static int __devinit lp5523_probe(struct i2c_client *client,
if (!pdata) { if (!pdata) {
dev_err(&client->dev, "no platform data\n"); dev_err(&client->dev, "no platform data\n");
ret = -EINVAL; return -EINVAL;
goto fail1;
} }
mutex_init(&chip->lock); mutex_init(&chip->lock);
@ -899,7 +898,7 @@ static int __devinit lp5523_probe(struct i2c_client *client,
if (pdata->setup_resources) { if (pdata->setup_resources) {
ret = pdata->setup_resources(); ret = pdata->setup_resources();
if (ret < 0) if (ret < 0)
goto fail1; return ret;
} }
if (pdata->enable) { if (pdata->enable) {
@ -916,7 +915,7 @@ static int __devinit lp5523_probe(struct i2c_client *client,
*/ */
ret = lp5523_detect(client); ret = lp5523_detect(client);
if (ret) if (ret)
goto fail2; goto fail1;
dev_info(&client->dev, "LP5523 Programmable led chip found\n"); dev_info(&client->dev, "LP5523 Programmable led chip found\n");
@ -925,13 +924,13 @@ static int __devinit lp5523_probe(struct i2c_client *client,
ret = lp5523_init_engine(&chip->engines[i], i + 1); ret = lp5523_init_engine(&chip->engines[i], i + 1);
if (ret) { if (ret) {
dev_err(&client->dev, "error initializing engine\n"); dev_err(&client->dev, "error initializing engine\n");
goto fail2; goto fail1;
} }
} }
ret = lp5523_configure(client); ret = lp5523_configure(client);
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "error configuring chip\n"); dev_err(&client->dev, "error configuring chip\n");
goto fail2; goto fail1;
} }
/* Initialize leds */ /* Initialize leds */
@ -949,7 +948,7 @@ static int __devinit lp5523_probe(struct i2c_client *client,
ret = lp5523_init_led(&chip->leds[led], &client->dev, i, pdata); ret = lp5523_init_led(&chip->leds[led], &client->dev, i, pdata);
if (ret) { if (ret) {
dev_err(&client->dev, "error initializing leds\n"); dev_err(&client->dev, "error initializing leds\n");
goto fail3; goto fail2;
} }
chip->num_leds++; chip->num_leds++;
@ -965,21 +964,19 @@ static int __devinit lp5523_probe(struct i2c_client *client,
ret = lp5523_register_sysfs(client); ret = lp5523_register_sysfs(client);
if (ret) { if (ret) {
dev_err(&client->dev, "registering sysfs failed\n"); dev_err(&client->dev, "registering sysfs failed\n");
goto fail3; goto fail2;
} }
return ret; return ret;
fail3: fail2:
for (i = 0; i < chip->num_leds; i++) { for (i = 0; i < chip->num_leds; i++) {
led_classdev_unregister(&chip->leds[i].cdev); led_classdev_unregister(&chip->leds[i].cdev);
cancel_work_sync(&chip->leds[i].brightness_work); cancel_work_sync(&chip->leds[i].brightness_work);
} }
fail2: fail1:
if (pdata->enable) if (pdata->enable)
pdata->enable(0); pdata->enable(0);
if (pdata->release_resources) if (pdata->release_resources)
pdata->release_resources(); pdata->release_resources();
fail1:
kfree(chip);
return ret; return ret;
} }
@ -999,7 +996,6 @@ static int lp5523_remove(struct i2c_client *client)
chip->pdata->enable(0); chip->pdata->enable(0);
if (chip->pdata->release_resources) if (chip->pdata->release_resources)
chip->pdata->release_resources(); chip->pdata->release_resources();
kfree(chip);
return 0; return 0;
} }