evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

misc: bh1770glc: Use managed functions

Browse source 
This patch introduces the use of managed interfaces like devm_kzalloc,
devm_regulator_bulk_get and does away with the functions to free the
allocated memory in the probe and remove functions. Also, some labels
are removed and renamed to preserve the ordering.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Himangi Saraogi 2014-07-21 13:55:35 +05:30 • committed by Greg Kroah-Hartman
parent 0178a7a54d
commit 4734e39064
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/misc/bh1770glc.c
View file

@ -1185,7 +1185,7 @@ static int bh1770_probe(struct i2c_client *client,
struct bh1770_chip *chip; struct bh1770_chip *chip;
int err; int err;
chip = kzalloc(sizeof *chip, GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof *chip, GFP_KERNEL);
if (!chip) if (!chip)
return -ENOMEM; return -ENOMEM;
@ -1198,8 +1198,7 @@ static int bh1770_probe(struct i2c_client *client,
if (client->dev.platform_data == NULL) { if (client->dev.platform_data == NULL) {
dev_err(&client->dev, "platform data is mandatory\n"); dev_err(&client->dev, "platform data is mandatory\n");
err = -EINVAL; return -EINVAL;
goto fail1;
} }
chip->pdata = client->dev.platform_data; chip->pdata = client->dev.platform_data;
@ -1224,24 +1223,24 @@ static int bh1770_probe(struct i2c_client *client,
chip->regs[0].supply = reg_vcc; chip->regs[0].supply = reg_vcc;
chip->regs[1].supply = reg_vleds; chip->regs[1].supply = reg_vleds;
err = regulator_bulk_get(&client->dev, err = devm_regulator_bulk_get(&client->dev,
ARRAY_SIZE(chip->regs), chip->regs); ARRAY_SIZE(chip->regs), chip->regs);
if (err < 0) { if (err < 0) {
dev_err(&client->dev, "Cannot get regulators\n"); dev_err(&client->dev, "Cannot get regulators\n");
goto fail1; return err;
} }
err = regulator_bulk_enable(ARRAY_SIZE(chip->regs), err = regulator_bulk_enable(ARRAY_SIZE(chip->regs),
chip->regs); chip->regs);
if (err < 0) { if (err < 0) {
dev_err(&client->dev, "Cannot enable regulators\n"); dev_err(&client->dev, "Cannot enable regulators\n");
goto fail2; return err;
} }
usleep_range(BH1770_STARTUP_DELAY, BH1770_STARTUP_DELAY * 2); usleep_range(BH1770_STARTUP_DELAY, BH1770_STARTUP_DELAY * 2);
err = bh1770_detect(chip); err = bh1770_detect(chip);
if (err < 0) if (err < 0)
goto fail3; goto fail0;
/* Start chip */ /* Start chip */
bh1770_chip_on(chip); bh1770_chip_on(chip);
@ -1252,14 +1251,14 @@ static int bh1770_probe(struct i2c_client *client,
if (chip->lux_corr == 0) { if (chip->lux_corr == 0) {
dev_err(&client->dev, "Improper correction values\n"); dev_err(&client->dev, "Improper correction values\n");
err = -EINVAL; err = -EINVAL;
goto fail3; goto fail0;
} }
if (chip->pdata->setup_resources) { if (chip->pdata->setup_resources) {
err = chip->pdata->setup_resources(); err = chip->pdata->setup_resources();
if (err) { if (err) {
err = -EINVAL; err = -EINVAL;
goto fail3; goto fail0;
} }
} }
@ -1267,7 +1266,7 @@ static int bh1770_probe(struct i2c_client *client,
&bh1770_attribute_group); &bh1770_attribute_group);
if (err < 0) { if (err < 0) {
dev_err(&chip->client->dev, "Sysfs registration failed\n"); dev_err(&chip->client->dev, "Sysfs registration failed\n");
goto fail4; goto fail1;
} }
/* /*
@ -1283,22 +1282,18 @@ static int bh1770_probe(struct i2c_client *client,
if (err) { if (err) {
dev_err(&client->dev, "could not get IRQ %d\n", dev_err(&client->dev, "could not get IRQ %d\n",
client->irq); client->irq);
goto fail5; goto fail2;
} }
regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs); regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs);
return err; return err;
fail5: fail2:
sysfs_remove_group(&chip->client->dev.kobj, sysfs_remove_group(&chip->client->dev.kobj,
&bh1770_attribute_group); &bh1770_attribute_group);
fail4: fail1:
if (chip->pdata->release_resources) if (chip->pdata->release_resources)
chip->pdata->release_resources(); chip->pdata->release_resources();
fail3: fail0:
regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs); regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs);
fail2:
regulator_bulk_free(ARRAY_SIZE(chip->regs), chip->regs);
fail1:
kfree(chip);
return err; return err;
} }
@ -1322,8 +1317,6 @@ static int bh1770_remove(struct i2c_client *client)
pm_runtime_disable(&client->dev); pm_runtime_disable(&client->dev);
pm_runtime_set_suspended(&client->dev); pm_runtime_set_suspended(&client->dev);
regulator_bulk_free(ARRAY_SIZE(chip->regs), chip->regs);
kfree(chip);
return 0; return 0;
} }