Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
regulator: ltc3589: Get rid of struct ltc3589_regulator
After converting to use simplified DT parsing, the struct ltc3589_regulator
only has a desc member. So let's remove struct ltc3589_regulator and use
struct regulator_desc instead.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Axel Lin
and committed by
Mark Brown
63c7c296
ce62ba3a
+31
-38
+31
-38
drivers/regulator/ltc3589.c
+31
-38
drivers/regulator/ltc3589.c
···
84
84
LTC3589_NUM_REGULATORS,
85
85
};
86
86
87
-
struct ltc3589_regulator {
88
-
struct regulator_desc desc;
89
-
};
90
-
91
87
struct ltc3589 {
92
88
struct regmap *regmap;
93
89
struct device *dev;
94
90
enum ltc3589_variant variant;
95
-
struct ltc3589_regulator regulator_descs[LTC3589_NUM_REGULATORS];
91
+
struct regulator_desc regulator_descs[LTC3589_NUM_REGULATORS];
96
92
struct regulator_dev *regulators[LTC3589_NUM_REGULATORS];
97
93
};
98
94
···
205
209
struct regulator_config *config)
206
210
{
207
211
struct ltc3589 *ltc3589 = config->driver_data;
208
-
struct ltc3589_regulator *rdesc = <c3589->regulator_descs[desc->id];
212
+
struct regulator_desc *rdesc = <c3589->regulator_descs[desc->id];
209
213
u32 r[2];
210
214
int ret;
211
215
···
223
227
if (!r[0] || !r[1])
224
228
return 0;
225
229
226
-
rdesc->desc.min_uV = ltc3589_scale(desc->min_uV, r[0], r[1]);
227
-
rdesc->desc.uV_step = ltc3589_scale(desc->uV_step, r[0], r[1]);
228
-
rdesc->desc.fixed_uV = ltc3589_scale(desc->fixed_uV, r[0], r[1]);
230
+
rdesc->min_uV = ltc3589_scale(desc->min_uV, r[0], r[1]);
231
+
rdesc->uV_step = ltc3589_scale(desc->uV_step, r[0], r[1]);
232
+
rdesc->fixed_uV = ltc3589_scale(desc->fixed_uV, r[0], r[1]);
229
233
230
234
return 0;
231
235
}
232
236
233
237
#define LTC3589_REG(_name, _of_name, _ops, en_bit, dtv1_reg, dtv_mask, go_bit)\
234
238
[LTC3589_ ## _name] = { \
235
-
.desc = { \
236
-
.name = #_name, \
237
-
.of_match = of_match_ptr(#_of_name), \
238
-
.regulators_node = of_match_ptr("regulators"), \
239
-
.of_parse_cb = ltc3589_of_parse_cb, \
240
-
.n_voltages = (dtv_mask) + 1, \
241
-
.min_uV = (go_bit) ? 362500 : 0, \
242
-
.uV_step = (go_bit) ? 12500 : 0, \
243
-
.ramp_delay = (go_bit) ? 1750 : 0, \
244
-
.fixed_uV = (dtv_mask) ? 0 : 800000, \
245
-
.ops = <c3589_ ## _ops ## _regulator_ops, \
246
-
.type = REGULATOR_VOLTAGE, \
247
-
.id = LTC3589_ ## _name, \
248
-
.owner = THIS_MODULE, \
249
-
.vsel_reg = (dtv1_reg), \
250
-
.vsel_mask = (dtv_mask), \
251
-
.apply_reg = (go_bit) ? LTC3589_VCCR : 0, \
252
-
.apply_bit = (go_bit), \
253
-
.enable_reg = (en_bit) ? LTC3589_OVEN : 0, \
254
-
.enable_mask = (en_bit), \
255
-
}, \
239
+
.name = #_name, \
240
+
.of_match = of_match_ptr(#_of_name), \
241
+
.regulators_node = of_match_ptr("regulators"), \
242
+
.of_parse_cb = ltc3589_of_parse_cb, \
243
+
.n_voltages = (dtv_mask) + 1, \
244
+
.min_uV = (go_bit) ? 362500 : 0, \
245
+
.uV_step = (go_bit) ? 12500 : 0, \
246
+
.ramp_delay = (go_bit) ? 1750 : 0, \
247
+
.fixed_uV = (dtv_mask) ? 0 : 800000, \
248
+
.ops = <c3589_ ## _ops ## _regulator_ops, \
249
+
.type = REGULATOR_VOLTAGE, \
250
+
.id = LTC3589_ ## _name, \
251
+
.owner = THIS_MODULE, \
252
+
.vsel_reg = (dtv1_reg), \
253
+
.vsel_mask = (dtv_mask), \
254
+
.apply_reg = (go_bit) ? LTC3589_VCCR : 0, \
255
+
.apply_bit = (go_bit), \
256
+
.enable_reg = (en_bit) ? LTC3589_OVEN : 0, \
257
+
.enable_mask = (en_bit), \
256
258
}
257
259
258
260
#define LTC3589_LINEAR_REG(_name, _of_name, _dtv1) \
···
261
267
#define LTC3589_FIXED_REG(_name, _of_name) \
262
268
LTC3589_REG(_name, _of_name, fixed, LTC3589_OVEN_ ## _name, 0, 0, 0)
263
269
264
-
static struct ltc3589_regulator ltc3589_regulators[LTC3589_NUM_REGULATORS] = {
270
+
static const struct regulator_desc ltc3589_regulators[] = {
265
271
LTC3589_LINEAR_REG(SW1, sw1, B1DTV1),
266
272
LTC3589_LINEAR_REG(SW2, sw2, B2DTV1),
267
273
LTC3589_LINEAR_REG(SW3, sw3, B3DTV1),
···
397
403
const struct i2c_device_id *id)
398
404
{
399
405
struct device *dev = &client->dev;
400
-
struct ltc3589_regulator *descs;
406
+
struct regulator_desc *descs;
401
407
struct ltc3589 *ltc3589;
402
408
int i, ret;
403
409
···
416
422
descs = ltc3589->regulator_descs;
417
423
memcpy(descs, ltc3589_regulators, sizeof(ltc3589_regulators));
418
424
if (ltc3589->variant == LTC3589) {
419
-
descs[LTC3589_LDO3].desc.fixed_uV = 1800000;
420
-
descs[LTC3589_LDO4].desc.volt_table = ltc3589_ldo4;
425
+
descs[LTC3589_LDO3].fixed_uV = 1800000;
426
+
descs[LTC3589_LDO4].volt_table = ltc3589_ldo4;
421
427
} else {
422
-
descs[LTC3589_LDO3].desc.fixed_uV = 2800000;
423
-
descs[LTC3589_LDO4].desc.volt_table = ltc3589_12_ldo4;
428
+
descs[LTC3589_LDO3].fixed_uV = 2800000;
429
+
descs[LTC3589_LDO4].volt_table = ltc3589_12_ldo4;
424
430
}
425
431
426
432
ltc3589->regmap = devm_regmap_init_i2c(client, <c3589_regmap_config);
···
431
437
}
432
438
433
439
for (i = 0; i < LTC3589_NUM_REGULATORS; i++) {
434
-
struct ltc3589_regulator *rdesc = <c3589->regulator_descs[i];
435
-
struct regulator_desc *desc = &rdesc->desc;
440
+
struct regulator_desc *desc = <c3589->regulator_descs[i];
436
441
struct regulator_config config = { };
437
442
438
443
config.dev = dev;