Skip to content

Commit cc26591

Browse files
danascapejic23
authored andcommitted
staging: iio: ad9834: Use devm_regulator_get_enable()
The regulators are only enabled at probe(), hence replace the boilerplate code by making use of devm_regulator_get_enable() helper. Signed-off-by: Saalim Quadri <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jonathan Cameron <[email protected]>
1 parent 33220e1 commit cc26591

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

drivers/staging/iio/frequency/ad9834.c

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -387,33 +387,15 @@ static const struct iio_info ad9833_info = {
387387
.attrs = &ad9833_attribute_group,
388388
};
389389

390-
static void ad9834_disable_reg(void *data)
391-
{
392-
struct regulator *reg = data;
393-
394-
regulator_disable(reg);
395-
}
396-
397390
static int ad9834_probe(struct spi_device *spi)
398391
{
399392
struct ad9834_state *st;
400393
struct iio_dev *indio_dev;
401-
struct regulator *reg;
402394
int ret;
403395

404-
reg = devm_regulator_get(&spi->dev, "avdd");
405-
if (IS_ERR(reg))
406-
return PTR_ERR(reg);
407-
408-
ret = regulator_enable(reg);
409-
if (ret) {
410-
dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
411-
return ret;
412-
}
413-
414-
ret = devm_add_action_or_reset(&spi->dev, ad9834_disable_reg, reg);
396+
ret = devm_regulator_get_enable(&spi->dev, "avdd");
415397
if (ret)
416-
return ret;
398+
return dev_err_probe(&spi->dev, ret, "Failed to enable specified AVDD supply\n");
417399

418400
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
419401
if (!indio_dev) {

0 commit comments

Comments
 (0)