Skip to content

Commit 9fcf6ef

Browse files
dlechbroonie
authored andcommitted
staging: iio: impedance-analyzer: ad5933: Use devm_regulator_get_enable_read_voltage()
We can reduce boilerplate code by using devm_regulator_get_enable_read_voltage(). Reviewed-by: Jonathan Cameron <[email protected]> Signed-off-by: David Lechner <[email protected]> Link: https://lore.kernel.org/r/20240429-regulator-get-enable-get-votlage-v2-6-b1f11ab766c1@baylibre.com Signed-off-by: Mark Brown <[email protected]>
1 parent 2f4bb1f commit 9fcf6ef

File tree

1 file changed

+2
-24
lines changed
  • drivers/staging/iio/impedance-analyzer

1 file changed

+2
-24
lines changed

drivers/staging/iio/impedance-analyzer/ad5933.c

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484

8585
struct ad5933_state {
8686
struct i2c_client *client;
87-
struct regulator *reg;
8887
struct clk *mclk;
8988
struct delayed_work work;
9089
struct mutex lock; /* Protect sensor state */
@@ -660,13 +659,6 @@ static void ad5933_work(struct work_struct *work)
660659
}
661660
}
662661

663-
static void ad5933_reg_disable(void *data)
664-
{
665-
struct ad5933_state *st = data;
666-
667-
regulator_disable(st->reg);
668-
}
669-
670662
static int ad5933_probe(struct i2c_client *client)
671663
{
672664
const struct i2c_device_id *id = i2c_client_get_device_id(client);
@@ -685,23 +677,9 @@ static int ad5933_probe(struct i2c_client *client)
685677

686678
mutex_init(&st->lock);
687679

688-
st->reg = devm_regulator_get(&client->dev, "vdd");
689-
if (IS_ERR(st->reg))
690-
return PTR_ERR(st->reg);
691-
692-
ret = regulator_enable(st->reg);
693-
if (ret) {
694-
dev_err(&client->dev, "Failed to enable specified VDD supply\n");
695-
return ret;
696-
}
697-
698-
ret = devm_add_action_or_reset(&client->dev, ad5933_reg_disable, st);
699-
if (ret)
700-
return ret;
701-
702-
ret = regulator_get_voltage(st->reg);
680+
ret = devm_regulator_get_enable_read_voltage(&client->dev, "vdd");
703681
if (ret < 0)
704-
return ret;
682+
return dev_err_probe(&client->dev, ret, "failed to get vdd voltage\n");
705683

706684
st->vref_mv = ret / 1000;
707685

0 commit comments

Comments
 (0)