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

Commit 71b710e7 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

regulator: tps6507x: Use devm_regulator_register 



devm_* simplifies the code.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9c7c9eae

drivers/regulator/tps6507x-regulator.c

+3 −20
Original line number Original line Diff line number Diff line
@@ -508,13 +508,13 @@ static int tps6507x_pmic_probe(struct platform_device *pdev) 
			config.of_node = tps6507x_reg_matches[i].of_node;

			config.of_node = tps6507x_reg_matches[i].of_node;

		}

		}





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

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

					       &config);

		if (IS_ERR(rdev)) {

		if (IS_ERR(rdev)) {

			dev_err(tps6507x_dev->dev,

			dev_err(tps6507x_dev->dev,

				"failed to register %s regulator\n",

				"failed to register %s regulator\n",

				pdev->name);

				pdev->name);

			error = PTR_ERR(rdev);

			return PTR_ERR(rdev);

			goto fail;

		}

		}





		/* Save regulator for cleanup */

		/* Save regulator for cleanup */
@@ -525,22 +525,6 @@ static int tps6507x_pmic_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, tps6507x_dev);

	platform_set_drvdata(pdev, tps6507x_dev);





	return 0;

	return 0;



fail:

	while (--i >= 0)

		regulator_unregister(tps->rdev[i]);

	return error;

}



static int tps6507x_pmic_remove(struct platform_device *pdev)

{

	struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);

	struct tps6507x_pmic *tps = tps6507x_dev->pmic;

	int i;



	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++)

		regulator_unregister(tps->rdev[i]);

	return 0;

}

}





static struct platform_driver tps6507x_pmic_driver = {

static struct platform_driver tps6507x_pmic_driver = {
@@ -549,7 +533,6 @@ static struct platform_driver tps6507x_pmic_driver = { 
		.owner = THIS_MODULE,

		.owner = THIS_MODULE,

	},

	},

	.probe = tps6507x_pmic_probe,

	.probe = tps6507x_pmic_probe,

	.remove = tps6507x_pmic_remove,

};

};





static int __init tps6507x_pmic_init(void)

static int __init tps6507x_pmic_init(void)