regulator: isl6271a: Remove *rdev[3] from struct isl_pmic
PATCH 1/2 regulator: isl6271a: Remove *rdev[3] from struct isl_pmic
This driver is using devm_regulator_register, so it's not necessary to store *rdev[3] in struct isl_pmic. Use a local variable instead.
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/isl6271a-regulator.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/regulator/isl6271a-regulator.c +4 -5
@@ -31,7 +31,6 @@/* PMIC details */ struct isl_pmic {struct i2c_client *client; -struct regulator_dev *rdev[3 ];struct mutex mtx; };
@@ -109,6 +108,7 @@ static const struct regulator_desc isl_rd[] = {static int isl6271a_probe (struct i2c_client *i2c,const struct i2c_device_id *id) { +struct regulator_dev *rdev;struct regulator_config config = { };struct regulator_init_data *init_data =dev_get_platdata (&i2c->dev);struct isl_pmic *pmic;
@@ -133,11 +133,10 @@ static int isl6271a_probe(struct i2c_client *i2c, config.init_data =NULL ; config.driver_data = pmic; - pmic->rdev[i] =devm_regulator_register (&i2c->dev, &isl_rd[i], - &config); -if (IS_ERR (pmic->rdev[i])) { + rdev =devm_regulator_register (&i2c->dev, &isl_rd[i], &config); +if (IS_ERR (rdev)) {dev_err (&i2c->dev,"failed to register %s\n" , id->name); -return PTR_ERR (pmic->rdev[i]); +return PTR_ERR (rdev); } }
Signature · 1 line
2.17.1
PATCH 2/2 regulator: isl6271a: Constify isl_core_ops and isl_fixed_ops
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/isl6271a-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/isl6271a-regulator.c +2 -2
@@ -65,14 +65,14 @@ static int isl6271a_set_voltage_sel(struct regulator_dev *dev,return err; } -static struct regulator_ops isl_core_ops = { +static const struct regulator_ops isl_core_ops = { .get_voltage_sel = isl6271a_get_voltage_sel, .set_voltage_sel = isl6271a_set_voltage_sel, .list_voltage = regulator_list_voltage_linear, .map_voltage = regulator_map_voltage_linear, }; -static struct regulator_ops isl_fixed_ops = { +static const struct regulator_ops isl_fixed_ops = { .list_voltage = regulator_list_voltage_linear, };
Signature · 1 line
2.17.1