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

Commit 5e085575 authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown
Browse files

regulator: tps6524x: use devm_regulator_register() 



Use devm_regulator_register() to make cleanup paths simpler,
and remove unnecessary remove().

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 11c0da7b

drivers/regulator/tps6524x-regulator.c

+5 −26
Original line number Diff line number Diff line
@@ -577,20 +577,6 @@ static struct regulator_ops regulator_ops = { 
	.get_current_limit	= get_current_limit,

};



static int pmic_remove(struct spi_device *spi)

{

	struct tps6524x *hw = spi_get_drvdata(spi);

	int i;



	if (!hw)

		return 0;

	for (i = 0; i < N_REGULATORS; i++) {

		regulator_unregister(hw->rdev[i]);

		hw->rdev[i] = NULL;

	}

	return 0;

}



static int pmic_probe(struct spi_device *spi)

{

	struct tps6524x *hw;
@@ -598,7 +584,7 @@ static int pmic_probe(struct spi_device *spi) 
	const struct supply_info *info = supply_info;

	struct regulator_init_data *init_data;

	struct regulator_config config = { };

	int ret = 0, i;

	int i;



	init_data = dev_get_platdata(dev);

	if (!init_data) {
@@ -631,24 +617,17 @@ static int pmic_probe(struct spi_device *spi) 
		config.init_data = init_data;

		config.driver_data = hw;



		hw->rdev[i] = regulator_register(&hw->desc[i], &config);

		if (IS_ERR(hw->rdev[i])) {

			ret = PTR_ERR(hw->rdev[i]);

			hw->rdev[i] = NULL;

			goto fail;

		}

		hw->rdev[i] = devm_regulator_register(dev, &hw->desc[i],

						      &config);

		if (IS_ERR(hw->rdev[i]))

			return PTR_ERR(hw->rdev[i]);

	}



	return 0;



fail:

	pmic_remove(spi);

	return ret;

}



static struct spi_driver pmic_driver = {

	.probe		= pmic_probe,

	.remove		= pmic_remove,

	.driver		= {

		.name	= "tps6524x",

		.owner	= THIS_MODULE,