Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: adc: ti-adc108s102: use devm_regulator_get_enable_read_voltage()
Use devm_regulator_get_enable_read_voltage() to simplify the code.
Signed-off-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20240621-iio-regulator-refactor-round-2-v1-7-49e50cd0b99a@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
David Lechner
and committed by
Jonathan Cameron
71c8bea4
0817c954
+3
-25
+3
-25
drivers/iio/adc/ti-adc108s102.c
+3
-25
drivers/iio/adc/ti-adc108s102.c
···
58
58
59
59
struct adc108s102_state {
60
60
struct spi_device *spi;
61
-
struct regulator *reg;
62
61
u32 va_millivolt;
63
62
/* SPI transfer used by triggered buffer handler*/
64
63
struct spi_transfer ring_xfer;
···
215
216
.update_scan_mode = &adc108s102_update_scan_mode,
216
217
};
217
218
218
-
static void adc108s102_reg_disable(void *reg)
219
-
{
220
-
regulator_disable(reg);
221
-
}
222
-
223
219
static int adc108s102_probe(struct spi_device *spi)
224
220
{
225
221
struct adc108s102_state *st;
···
230
236
if (ACPI_COMPANION(&spi->dev)) {
231
237
st->va_millivolt = ADC108S102_VA_MV_ACPI_DEFAULT;
232
238
} else {
233
-
st->reg = devm_regulator_get(&spi->dev, "vref");
234
-
if (IS_ERR(st->reg))
235
-
return PTR_ERR(st->reg);
236
-
237
-
ret = regulator_enable(st->reg);
238
-
if (ret < 0) {
239
-
dev_err(&spi->dev, "Cannot enable vref regulator\n");
240
-
return ret;
241
-
}
242
-
ret = devm_add_action_or_reset(&spi->dev, adc108s102_reg_disable,
243
-
st->reg);
244
-
if (ret)
245
-
return ret;
246
-
247
-
ret = regulator_get_voltage(st->reg);
248
-
if (ret < 0) {
249
-
dev_err(&spi->dev, "vref get voltage failed\n");
250
-
return ret;
251
-
}
239
+
ret = devm_regulator_get_enable_read_voltage(&spi->dev, "vref");
240
+
if (ret < 0)
241
+
return dev_err_probe(&spi->dev, ret, "failed get vref voltage\n");
252
242
253
243
st->va_millivolt = ret / 1000;
254
244
}