| .. | .. |
|---|
| 31 | 31 | /* PMIC details */ |
|---|
| 32 | 32 | struct isl_pmic { |
|---|
| 33 | 33 | struct i2c_client *client; |
|---|
| 34 | | - struct regulator_dev *rdev[3]; |
|---|
| 35 | 34 | struct mutex mtx; |
|---|
| 36 | 35 | }; |
|---|
| 37 | 36 | |
|---|
| .. | .. |
|---|
| 66 | 65 | return err; |
|---|
| 67 | 66 | } |
|---|
| 68 | 67 | |
|---|
| 69 | | -static struct regulator_ops isl_core_ops = { |
|---|
| 68 | +static const struct regulator_ops isl_core_ops = { |
|---|
| 70 | 69 | .get_voltage_sel = isl6271a_get_voltage_sel, |
|---|
| 71 | 70 | .set_voltage_sel = isl6271a_set_voltage_sel, |
|---|
| 72 | 71 | .list_voltage = regulator_list_voltage_linear, |
|---|
| 73 | 72 | .map_voltage = regulator_map_voltage_linear, |
|---|
| 74 | 73 | }; |
|---|
| 75 | 74 | |
|---|
| 76 | | -static struct regulator_ops isl_fixed_ops = { |
|---|
| 75 | +static const struct regulator_ops isl_fixed_ops = { |
|---|
| 77 | 76 | .list_voltage = regulator_list_voltage_linear, |
|---|
| 78 | 77 | }; |
|---|
| 79 | 78 | |
|---|
| .. | .. |
|---|
| 109 | 108 | static int isl6271a_probe(struct i2c_client *i2c, |
|---|
| 110 | 109 | const struct i2c_device_id *id) |
|---|
| 111 | 110 | { |
|---|
| 111 | + struct regulator_dev *rdev; |
|---|
| 112 | 112 | struct regulator_config config = { }; |
|---|
| 113 | 113 | struct regulator_init_data *init_data = dev_get_platdata(&i2c->dev); |
|---|
| 114 | 114 | struct isl_pmic *pmic; |
|---|
| .. | .. |
|---|
| 133 | 133 | config.init_data = NULL; |
|---|
| 134 | 134 | config.driver_data = pmic; |
|---|
| 135 | 135 | |
|---|
| 136 | | - pmic->rdev[i] = devm_regulator_register(&i2c->dev, &isl_rd[i], |
|---|
| 137 | | - &config); |
|---|
| 138 | | - if (IS_ERR(pmic->rdev[i])) { |
|---|
| 136 | + rdev = devm_regulator_register(&i2c->dev, &isl_rd[i], &config); |
|---|
| 137 | + if (IS_ERR(rdev)) { |
|---|
| 139 | 138 | dev_err(&i2c->dev, "failed to register %s\n", id->name); |
|---|
| 140 | | - return PTR_ERR(pmic->rdev[i]); |
|---|
| 139 | + return PTR_ERR(rdev); |
|---|
| 141 | 140 | } |
|---|
| 142 | 141 | } |
|---|
| 143 | 142 | |
|---|