Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4734e390 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Greg Kroah-Hartman
Browse files

misc: bh1770glc: Use managed functions 



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: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0178a7a5

drivers/misc/bh1770glc.c

+14 −21
Original line number Diff line number Diff line
@@ -1185,7 +1185,7 @@ static int bh1770_probe(struct i2c_client *client, 
	struct bh1770_chip *chip;

	int err;



	chip = kzalloc(sizeof *chip, GFP_KERNEL);

	chip = devm_kzalloc(&client->dev, sizeof *chip, GFP_KERNEL);

	if (!chip)

		return -ENOMEM;
@@ -1198,8 +1198,7 @@ static int bh1770_probe(struct i2c_client *client, 


	if (client->dev.platform_data == NULL) {

		dev_err(&client->dev, "platform data is mandatory\n");

		err = -EINVAL;

		goto fail1;

		return -EINVAL;

	}



	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[1].supply = reg_vleds;



	err = regulator_bulk_get(&client->dev,

	err = devm_regulator_bulk_get(&client->dev,

				      ARRAY_SIZE(chip->regs), chip->regs);

	if (err < 0) {

		dev_err(&client->dev, "Cannot get regulators\n");

		goto fail1;

		return err;

	}



	err = regulator_bulk_enable(ARRAY_SIZE(chip->regs),

				chip->regs);

	if (err < 0) {

		dev_err(&client->dev, "Cannot enable regulators\n");

		goto fail2;

		return err;

	}



	usleep_range(BH1770_STARTUP_DELAY, BH1770_STARTUP_DELAY * 2);

	err = bh1770_detect(chip);

	if (err < 0)

		goto fail3;

		goto fail0;



	/* Start chip */

	bh1770_chip_on(chip);
@@ -1252,14 +1251,14 @@ static int bh1770_probe(struct i2c_client *client, 
	if (chip->lux_corr == 0) {

		dev_err(&client->dev, "Improper correction values\n");

		err = -EINVAL;

		goto fail3;

		goto fail0;

	}



	if (chip->pdata->setup_resources) {

		err = chip->pdata->setup_resources();

		if (err) {

			err = -EINVAL;

			goto fail3;

			goto fail0;

		}

	}
@@ -1267,7 +1266,7 @@ static int bh1770_probe(struct i2c_client *client, 
				&bh1770_attribute_group);

	if (err < 0) {

		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) {

		dev_err(&client->dev, "could not get IRQ %d\n",

			client->irq);

		goto fail5;

		goto fail2;

	}

	regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs);

	return err;

fail5:

fail2:

	sysfs_remove_group(&chip->client->dev.kobj,

			&bh1770_attribute_group);

fail4:

fail1:

	if (chip->pdata->release_resources)

		chip->pdata->release_resources();

fail3:

fail0:

	regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs);

fail2:

	regulator_bulk_free(ARRAY_SIZE(chip->regs), chip->regs);

fail1:

	kfree(chip);

	return err;

}
@@ -1322,8 +1317,6 @@ static int bh1770_remove(struct i2c_client *client) 
	pm_runtime_disable(&client->dev);

	pm_runtime_set_suspended(&client->dev);



	regulator_bulk_free(ARRAY_SIZE(chip->regs), chip->regs);

	kfree(chip);

	return 0;

}