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

regulator: tps6586x: Remove unnecessary rdev[] array 

Now we are using devm_regulator_register(), so we don't need the rdev[] array
to store return value of devm_regulator_register. Use a *rdev variable is
enough for checking return status.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Axel Lin 2014-03-08 21:15:59 +08:00 committed by Mark Brown
parent 02e905845f
commit d6fe2c7251
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/regulator/tps6586x-regulator.c
View File

@ -396,7 +396,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
{ {
struct tps6586x_regulator *ri = NULL; struct tps6586x_regulator *ri = NULL;
struct regulator_config config = { }; struct regulator_config config = { };
struct regulator_dev **rdev; struct regulator_dev *rdev;
struct regulator_init_data *reg_data; struct regulator_init_data *reg_data;
struct tps6586x_platform_data *pdata; struct tps6586x_platform_data *pdata;
struct of_regulator_match *tps6586x_reg_matches = NULL; struct of_regulator_match *tps6586x_reg_matches = NULL;
@ -416,11 +416,6 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
rdev = devm_kzalloc(&pdev->dev, TPS6586X_ID_MAX_REGULATOR *
sizeof(*rdev), GFP_KERNEL);
if (!rdev)
return -ENOMEM;
version = tps6586x_get_version(pdev->dev.parent); version = tps6586x_get_version(pdev->dev.parent);
for (id = 0; id < TPS6586X_ID_MAX_REGULATOR; ++id) { for (id = 0; id < TPS6586X_ID_MAX_REGULATOR; ++id) {
@ -447,12 +442,11 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
if (tps6586x_reg_matches) if (tps6586x_reg_matches)
config.of_node = tps6586x_reg_matches[id].of_node; config.of_node = tps6586x_reg_matches[id].of_node;
rdev[id] = devm_regulator_register(&pdev->dev, &ri->desc, rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
&config); if (IS_ERR(rdev)) {
if (IS_ERR(rdev[id])) {
dev_err(&pdev->dev, "failed to register regulator %s\n", dev_err(&pdev->dev, "failed to register regulator %s\n",
ri->desc.name); ri->desc.name);
return PTR_ERR(rdev[id]); return PTR_ERR(rdev);
} }
if (reg_data) { if (reg_data) {