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

Commit 31195252 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: s2mps11: Don't store registered regulators in state container 



Regulators registered by devm_regulator_register() do not have to be
stored in state container because they are never dereferenced later.
The array of regulator_dev can be safely removed from state container.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b28a960c

drivers/regulator/s2mps11.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ 
#define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators)

#define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators)





struct s2mps11_info {

struct s2mps11_info {

	struct regulator_dev *rdev[S2MPS11_REGULATOR_MAX];



	int ramp_delay2;

	int ramp_delay2;

	int ramp_delay34;

	int ramp_delay34;

	int ramp_delay5;

	int ramp_delay5;
@@ -439,6 +437,8 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) 
	config.regmap = iodev->regmap_pmic;

	config.regmap = iodev->regmap_pmic;

	config.driver_data = s2mps11;

	config.driver_data = s2mps11;

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

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

		struct regulator_dev *regulator;



		if (!reg_np) {

		if (!reg_np) {

			config.init_data = pdata->regulators[i].initdata;

			config.init_data = pdata->regulators[i].initdata;

			config.of_node = pdata->regulators[i].reg_node;

			config.of_node = pdata->regulators[i].reg_node;
@@ -447,10 +447,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) 
			config.of_node = rdata[i].of_node;

			config.of_node = rdata[i].of_node;

		}

		}





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

		regulator = devm_regulator_register(&pdev->dev,

						&regulators[i], &config);

						&regulators[i], &config);

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

		if (IS_ERR(regulator)) {

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

			ret = PTR_ERR(regulator);

			dev_err(&pdev->dev, "regulator init failed for %d\n",

			dev_err(&pdev->dev, "regulator init failed for %d\n",

				i);

				i);

			return ret;

			return ret;