mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 07:04:44 +00:00
Code Issues Releases Wiki Activity

iio: magn: ak8975: refactor regulator handlers

Browse source 
Move the regulator_get() calls directly into the probe() function,
keep only the power_on()/power_off() functions to flick the
regulators on/off.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Linus Walleij 2016-06-29 14:08:35 +02:00 committed by Jonathan Cameron
parent b21d3f3452
commit 9e6c16d989
1 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/iio/magnetometer/ak8975.c
View file

@ -383,32 +383,19 @@ struct ak8975_data {
}; };
/* Enable attached power regulator if any. */ /* Enable attached power regulator if any. */
static int ak8975_power_on(struct i2c_client *client) static int ak8975_power_on(const struct ak8975_data *data)
{ {
const struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct ak8975_data *data = iio_priv(indio_dev);
int ret; int ret;
data->vdd = devm_regulator_get(&client->dev, "vdd"); ret = regulator_enable(data->vdd);
if (IS_ERR(data->vdd)) {
ret = PTR_ERR(data->vdd);
} else {
ret = regulator_enable(data->vdd);
}
if (ret) { if (ret) {
dev_warn(&client->dev, dev_warn(&data->client->dev,
"Failed to enable specified Vdd supply\n"); "Failed to enable specified Vdd supply\n");
return ret; return ret;
} }
ret = regulator_enable(data->vid);
data->vid = devm_regulator_get(&client->dev, "vid");
if (IS_ERR(data->vid)) {
ret = PTR_ERR(data->vid);
} else {
ret = regulator_enable(data->vid);
}
if (ret) { if (ret) {
dev_warn(&client->dev, dev_warn(&data->client->dev,
"Failed to enable specified Vid supply\n"); "Failed to enable specified Vid supply\n");
return ret; return ret;
} }
@ -416,11 +403,8 @@ static int ak8975_power_on(struct i2c_client *client)
} }
/* Disable attached power regulator if any. */ /* Disable attached power regulator if any. */
static void ak8975_power_off(const struct i2c_client *client) static void ak8975_power_off(const struct ak8975_data *data)
{ {
const struct iio_dev *indio_dev = i2c_get_clientdata(client);
const struct ak8975_data *data = iio_priv(indio_dev);
regulator_disable(data->vid); regulator_disable(data->vid);
regulator_disable(data->vdd); regulator_disable(data->vdd);
} }
@ -937,7 +921,15 @@ static int ak8975_probe(struct i2c_client *client,
data->def = &ak_def_array[chipset]; data->def = &ak_def_array[chipset];
err = ak8975_power_on(client); /* Fetch the regulators */
data->vdd = devm_regulator_get(&client->dev, "vdd");
if (IS_ERR(data->vdd))
return PTR_ERR(data->vdd);
data->vid = devm_regulator_get(&client->dev, "vid");
if (IS_ERR(data->vid))
return PTR_ERR(data->vid);
err = ak8975_power_on(data);
if (err) if (err)
return err; return err;
@ -982,17 +974,18 @@ static int ak8975_probe(struct i2c_client *client,
cleanup_buffer: cleanup_buffer:
iio_triggered_buffer_cleanup(indio_dev); iio_triggered_buffer_cleanup(indio_dev);
power_off: power_off:
ak8975_power_off(client); ak8975_power_off(data);
return err; return err;
} }
static int ak8975_remove(struct i2c_client *client) static int ak8975_remove(struct i2c_client *client)
{ {
struct iio_dev *indio_dev = i2c_get_clientdata(client); struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct ak8975_data *data = iio_priv(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_triggered_buffer_cleanup(indio_dev); iio_triggered_buffer_cleanup(indio_dev);
ak8975_power_off(client); ak8975_power_off(data);
return 0; return 0;
} }