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:
Родитель
5ee77ef27e
Коммит
fb8eb45400
|
@ -62,7 +62,6 @@
|
|||
#define ACT8865_VOLTAGE_NUM 64
|
||||
|
||||
struct act8865 {
|
||||
struct regulator_dev *rdev[ACT8865_REG_NUM];
|
||||
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,
|
||||
const struct i2c_device_id *i2c_id)
|
||||
{
|
||||
struct regulator_dev **rdev;
|
||||
struct regulator_dev *rdev;
|
||||
struct device *dev = &client->dev;
|
||||
struct act8865_platform_data *pdata = dev_get_platdata(dev);
|
||||
struct regulator_config config = { };
|
||||
|
@ -290,8 +289,6 @@ static int act8865_pmic_probe(struct i2c_client *client,
|
|||
if (!act8865)
|
||||
return -ENOMEM;
|
||||
|
||||
rdev = act8865->rdev;
|
||||
|
||||
act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config);
|
||||
if (IS_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.regmap = act8865->regmap;
|
||||
|
||||
rdev[i] = devm_regulator_register(&client->dev,
|
||||
&act8865_reg[i], &config);
|
||||
if (IS_ERR(rdev[i])) {
|
||||
rdev = devm_regulator_register(&client->dev, &act8865_reg[i],
|
||||
&config);
|
||||
if (IS_ERR(rdev)) {
|
||||
dev_err(dev, "failed to register %s\n",
|
||||
act8865_reg[id].name);
|
||||
return PTR_ERR(rdev[i]);
|
||||
return PTR_ERR(rdev);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче