Commit 3dfa1d4f authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Jonathan Cameron

iio: adc: max1363: simplify using devm_regulator_get_enable()

Drop open-coded pattern: 'devm_regulator_get(), regulator_enable(),
add_action_or_reset(regulator_disable)' and use the
devm_regulator_get_enable() and drop the pointer to the regulator.
This simplifies code and makes it less tempting to add manual control
for the regulator which is also controlled by devm.
Signed-off-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Acked-by: default avatarNuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/1286ea127d190e5708a0aaff271819b2d3f8802d.1660934107.git.mazziesaccount@gmail.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent f55c8e66
...@@ -148,7 +148,6 @@ struct max1363_chip_info { ...@@ -148,7 +148,6 @@ struct max1363_chip_info {
* @chip_info: chip model specific constants, available modes, etc. * @chip_info: chip model specific constants, available modes, etc.
* @current_mode: the scan mode of this chip * @current_mode: the scan mode of this chip
* @requestedmask: a valid requested set of channels * @requestedmask: a valid requested set of channels
* @reg: supply regulator
* @lock: lock to ensure state is consistent * @lock: lock to ensure state is consistent
* @monitor_on: whether monitor mode is enabled * @monitor_on: whether monitor mode is enabled
* @monitor_speed: parameter corresponding to device monitor speed setting * @monitor_speed: parameter corresponding to device monitor speed setting
...@@ -168,7 +167,6 @@ struct max1363_state { ...@@ -168,7 +167,6 @@ struct max1363_state {
const struct max1363_chip_info *chip_info; const struct max1363_chip_info *chip_info;
const struct max1363_mode *current_mode; const struct max1363_mode *current_mode;
u32 requestedmask; u32 requestedmask;
struct regulator *reg;
struct mutex lock; struct mutex lock;
/* Using monitor modes and buffer at the same time is /* Using monitor modes and buffer at the same time is
...@@ -1597,15 +1595,7 @@ static int max1363_probe(struct i2c_client *client, ...@@ -1597,15 +1595,7 @@ static int max1363_probe(struct i2c_client *client,
st = iio_priv(indio_dev); st = iio_priv(indio_dev);
mutex_init(&st->lock); mutex_init(&st->lock);
st->reg = devm_regulator_get(&client->dev, "vcc"); ret = devm_regulator_get_enable(&client->dev, "vcc");
if (IS_ERR(st->reg))
return PTR_ERR(st->reg);
ret = regulator_enable(st->reg);
if (ret)
return ret;
ret = devm_add_action_or_reset(&client->dev, max1363_reg_disable, st->reg);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment