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@xxxxxxxxxx>
---
drivers/iio/magnetometer/ak8975.c | 38 +++++++++++++++-----------------------
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index 62f73d9d38b4..8844e6f45c8e 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -383,32 +383,19 @@ struct ak8975_data {
};
/* 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;
- data->vdd = devm_regulator_get(&client->dev, "vdd");
- if (IS_ERR(data->vdd)) {
- ret = PTR_ERR(data->vdd);
- } else {
- ret = regulator_enable(data->vdd);
- }
+ ret = regulator_enable(data->vdd);
if (ret) {
- dev_warn(&client->dev,
+ dev_warn(&data->client->dev,
"Failed to enable specified Vdd supply\n");
return ret;
}
-
- data->vid = devm_regulator_get(&client->dev, "vid");
- if (IS_ERR(data->vid)) {
- ret = PTR_ERR(data->vid);
- } else {
- ret = regulator_enable(data->vid);
- }
+ ret = regulator_enable(data->vid);
if (ret) {
- dev_warn(&client->dev,
+ dev_warn(&data->client->dev,
"Failed to enable specified Vid supply\n");
return ret;
}
@@ -416,11 +403,8 @@ static int ak8975_power_on(struct i2c_client *client)
}
/* 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->vdd);
}
@@ -932,7 +916,15 @@ static int ak8975_probe(struct i2c_client *client,
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)
return err;
--
2.4.11
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
