Commit 7c6b8e3b authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

regulator: ab8500: Remove *regulator from struct ab8500_regulator_info

Current code is using devm_regulator_register() so we don't need to save
*regulator for clean up, use a local variable instead.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6d66d995
...@@ -44,7 +44,6 @@ struct ab8500_shared_mode { ...@@ -44,7 +44,6 @@ struct ab8500_shared_mode {
* struct ab8500_regulator_info - ab8500 regulator information * struct ab8500_regulator_info - ab8500 regulator information
* @dev: device pointer * @dev: device pointer
* @desc: regulator description * @desc: regulator description
* @regulator_dev: regulator device
* @shared_mode: used when mode is shared between two regulators * @shared_mode: used when mode is shared between two regulators
* @load_lp_uA: maximum load in idle (low power) mode * @load_lp_uA: maximum load in idle (low power) mode
* @update_bank: bank to control on/off * @update_bank: bank to control on/off
...@@ -65,7 +64,6 @@ struct ab8500_shared_mode { ...@@ -65,7 +64,6 @@ struct ab8500_shared_mode {
struct ab8500_regulator_info { struct ab8500_regulator_info {
struct device *dev; struct device *dev;
struct regulator_desc desc; struct regulator_desc desc;
struct regulator_dev *regulator;
struct ab8500_shared_mode *shared_mode; struct ab8500_shared_mode *shared_mode;
int load_lp_uA; int load_lp_uA;
u8 update_bank; u8 update_bank;
...@@ -1600,6 +1598,7 @@ static int ab8500_regulator_register(struct platform_device *pdev, ...@@ -1600,6 +1598,7 @@ static int ab8500_regulator_register(struct platform_device *pdev,
struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
struct ab8500_regulator_info *info = NULL; struct ab8500_regulator_info *info = NULL;
struct regulator_config config = { }; struct regulator_config config = { };
struct regulator_dev *rdev;
/* assign per-regulator data */ /* assign per-regulator data */
info = &abx500_regulator.info[id]; info = &abx500_regulator.info[id];
...@@ -1621,12 +1620,11 @@ static int ab8500_regulator_register(struct platform_device *pdev, ...@@ -1621,12 +1620,11 @@ static int ab8500_regulator_register(struct platform_device *pdev,
} }
/* register regulator with framework */ /* register regulator with framework */
info->regulator = devm_regulator_register(&pdev->dev, &info->desc, rdev = devm_regulator_register(&pdev->dev, &info->desc, &config);
&config); if (IS_ERR(rdev)) {
if (IS_ERR(info->regulator)) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",
info->desc.name); info->desc.name);
return PTR_ERR(info->regulator); return PTR_ERR(rdev);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment