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

Commit 44815b4a authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

regulator: max77686: 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 d55cd794

drivers/regulator/max77686.c

+3 −19
Original line number Diff line number Diff line
@@ -478,31 +478,16 @@ static int max77686_pmic_probe(struct platform_device *pdev) 
		config.of_node = pdata->regulators[i].of_node;



		max77686->opmode[i] = regulators[i].enable_mask;

		max77686->rdev[i] = regulator_register(&regulators[i], &config);

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

						&regulators[i], &config);

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

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

			dev_err(&pdev->dev,

				"regulator init failed for %d\n", i);

			max77686->rdev[i] = NULL;

			goto err;

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

		}

	}



	return 0;

err:

	while (--i >= 0)

		regulator_unregister(max77686->rdev[i]);

	return ret;

}



static int max77686_pmic_remove(struct platform_device *pdev)

{

	struct max77686_data *max77686 = platform_get_drvdata(pdev);

	int i;



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

		regulator_unregister(max77686->rdev[i]);



	return 0;

}
@@ -518,7 +503,6 @@ static struct platform_driver max77686_pmic_driver = { 
		.owner = THIS_MODULE,

	},

	.probe = max77686_pmic_probe,

	.remove = max77686_pmic_remove,

	.id_table = max77686_pmic_id,

};