p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regulator: act8865: Remove unnecessary *rdev[] from struct act8865 

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>
Acked-by: Wenyou Yang <Wenyou.yang@atmel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Axel Lin 2014-03-08 21:19:07 +08:00 committed by Mark Brown
parent 5ee77ef27e
commit fb8eb45400
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/regulator/act8865-regulator.c
View File

@ -62,7 +62,6 @@
#define ACT8865_VOLTAGE_NUM 64 #define ACT8865_VOLTAGE_NUM 64
struct act8865 { struct act8865 {
struct regulator_dev *rdev[ACT8865_REG_NUM];
struct regmap *regmap; struct regmap *regmap;
}; };
@ -256,7 +255,7 @@ static inline int act8865_pdata_from_dt(struct device *dev,
static int act8865_pmic_probe(struct i2c_client *client, static int act8865_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id) const struct i2c_device_id *i2c_id)
{ {
struct regulator_dev **rdev; struct regulator_dev *rdev;
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct act8865_platform_data *pdata = dev_get_platdata(dev); struct act8865_platform_data *pdata = dev_get_platdata(dev);
struct regulator_config config = { }; struct regulator_config config = { };
@ -290,8 +289,6 @@ static int act8865_pmic_probe(struct i2c_client *client,
if (!act8865) if (!act8865)
return -ENOMEM; return -ENOMEM;
rdev = act8865->rdev;
act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config); act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config);
if (IS_ERR(act8865->regmap)) { if (IS_ERR(act8865->regmap)) {
error = PTR_ERR(act8865->regmap); error = PTR_ERR(act8865->regmap);
@ -311,12 +308,12 @@ static int act8865_pmic_probe(struct i2c_client *client,
config.driver_data = act8865; config.driver_data = act8865;
config.regmap = act8865->regmap; config.regmap = act8865->regmap;
rdev[i] = devm_regulator_register(&client->dev, rdev = devm_regulator_register(&client->dev, &act8865_reg[i],
&act8865_reg[i], &config); &config);
if (IS_ERR(rdev[i])) { if (IS_ERR(rdev)) {
dev_err(dev, "failed to register %s\n", dev_err(dev, "failed to register %s\n",
act8865_reg[id].name); act8865_reg[id].name);
return PTR_ERR(rdev[i]); return PTR_ERR(rdev);
} }
} }