OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regulator: s2mps11: Use array to save pointer to rdev 

The number of regulator is known at compile time, use array to save pointer to
rdev makes the code simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-07-13 10:12:40 +08:00 committed by Mark Brown
parent fea7a08acb
commit ad46ed14ca
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/regulator/s2mps11.c
View File

@ -24,7 +24,7 @@
#include <linux/mfd/samsung/s2mps11.h> #include <linux/mfd/samsung/s2mps11.h>
struct s2mps11_info { struct s2mps11_info {
struct regulator_dev **rdev; struct regulator_dev *rdev[S2MPS11_REGULATOR_MAX];
int ramp_delay2; int ramp_delay2;
int ramp_delay34; int ramp_delay34;
@ -236,9 +236,8 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct sec_platform_data *pdata = dev_get_platdata(iodev->dev); struct sec_platform_data *pdata = dev_get_platdata(iodev->dev);
struct regulator_config config = { }; struct regulator_config config = { };
struct regulator_dev **rdev;
struct s2mps11_info *s2mps11; struct s2mps11_info *s2mps11;
int i, ret, size; int i, ret;
unsigned char ramp_enable, ramp_reg = 0; unsigned char ramp_enable, ramp_reg = 0;
if (!pdata) { if (!pdata) {
@ -251,13 +250,6 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
if (!s2mps11) if (!s2mps11)
return -ENOMEM; return -ENOMEM;
size = sizeof(struct regulator_dev *) * S2MPS11_REGULATOR_MAX;
s2mps11->rdev = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
if (!s2mps11->rdev) {
return -ENOMEM;
}
rdev = s2mps11->rdev;
platform_set_drvdata(pdev, s2mps11); platform_set_drvdata(pdev, s2mps11);
s2mps11->ramp_delay2 = pdata->buck2_ramp_delay; s2mps11->ramp_delay2 = pdata->buck2_ramp_delay;
@ -297,12 +289,12 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
config.init_data = pdata->regulators[i].initdata; config.init_data = pdata->regulators[i].initdata;
config.driver_data = s2mps11; config.driver_data = s2mps11;
rdev[i] = regulator_register(&regulators[i], &config); s2mps11->rdev[i] = regulator_register(&regulators[i], &config);
if (IS_ERR(rdev[i])) { if (IS_ERR(s2mps11->rdev[i])) {
ret = PTR_ERR(rdev[i]); ret = PTR_ERR(s2mps11->rdev[i]);
dev_err(&pdev->dev, "regulator init failed for %d\n", dev_err(&pdev->dev, "regulator init failed for %d\n",
i); i);
rdev[i] = NULL; s2mps11->rdev[i] = NULL;
goto err; goto err;
} }
} }
@ -310,8 +302,7 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) for (i = 0; i < S2MPS11_REGULATOR_MAX; i++)
if (rdev[i]) regulator_unregister(s2mps11->rdev[i]);
regulator_unregister(rdev[i]);
return ret; return ret;
} }
@ -319,12 +310,10 @@ err:
static int __devexit s2mps11_pmic_remove(struct platform_device *pdev) static int __devexit s2mps11_pmic_remove(struct platform_device *pdev)
{ {
struct s2mps11_info *s2mps11 = platform_get_drvdata(pdev); struct s2mps11_info *s2mps11 = platform_get_drvdata(pdev);
struct regulator_dev **rdev = s2mps11->rdev;
int i; int i;
for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) for (i = 0; i < S2MPS11_REGULATOR_MAX; i++)
if (rdev[i]) regulator_unregister(s2mps11->rdev[i]);
regulator_unregister(rdev[i]);
return 0; return 0;
} }