Commit 1fa4ff1f authored by Jonathan Cameron's avatar Jonathan Cameron

iio: accel: kxcjk-1013: Use devm_regulator_bulk_get_enable()

This driver only turns the power on at probe and off via a custom
devm_add_action_or_reset() callback. The new
devm_regulator_bulk_get_enable() replaces this boilerplate code.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Reviewed-by: default avatarNuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20221016163409.320197-5-jic23@kernel.org
parent 5b30e739
...@@ -241,7 +241,6 @@ enum kxcjk1013_axis { ...@@ -241,7 +241,6 @@ enum kxcjk1013_axis {
}; };
struct kxcjk1013_data { struct kxcjk1013_data {
struct regulator_bulk_data regulators[2];
struct i2c_client *client; struct i2c_client *client;
struct iio_trigger *dready_trig; struct iio_trigger *dready_trig;
struct iio_trigger *motion_trig; struct iio_trigger *motion_trig;
...@@ -1425,16 +1424,10 @@ static const char *kxcjk1013_match_acpi_device(struct device *dev, ...@@ -1425,16 +1424,10 @@ static const char *kxcjk1013_match_acpi_device(struct device *dev,
return dev_name(dev); return dev_name(dev);
} }
static void kxcjk1013_disable_regulators(void *d)
{
struct kxcjk1013_data *data = d;
regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);
}
static int kxcjk1013_probe(struct i2c_client *client, static int kxcjk1013_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
static const char * const regulator_names[] = { "vdd", "vddio" };
struct kxcjk1013_data *data; struct kxcjk1013_data *data;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct kxcjk_1013_platform_data *pdata; struct kxcjk_1013_platform_data *pdata;
...@@ -1461,22 +1454,12 @@ static int kxcjk1013_probe(struct i2c_client *client, ...@@ -1461,22 +1454,12 @@ static int kxcjk1013_probe(struct i2c_client *client,
return ret; return ret;
} }
data->regulators[0].supply = "vdd"; ret = devm_regulator_bulk_get_enable(&client->dev,
data->regulators[1].supply = "vddio"; ARRAY_SIZE(regulator_names),
ret = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(data->regulators), regulator_names);
data->regulators);
if (ret) if (ret)
return dev_err_probe(&client->dev, ret, "Failed to get regulators\n"); return dev_err_probe(&client->dev, ret, "Failed to get regulators\n");
ret = regulator_bulk_enable(ARRAY_SIZE(data->regulators),
data->regulators);
if (ret)
return ret;
ret = devm_add_action_or_reset(&client->dev, kxcjk1013_disable_regulators, data);
if (ret)
return ret;
/* /*
* A typical delay of 10ms is required for powering up * A typical delay of 10ms is required for powering up
* according to the data sheets of supported chips. * according to the data sheets of supported chips.
......
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