|
@@ -220,11 +220,11 @@ static int ad5446_probe(struct device *dev, const char *name,
|
|
|
struct regulator *reg;
|
|
|
int ret, voltage_uv = 0;
|
|
|
|
|
|
- reg = regulator_get(dev, "vcc");
|
|
|
+ reg = devm_regulator_get(dev, "vcc");
|
|
|
if (!IS_ERR(reg)) {
|
|
|
ret = regulator_enable(reg);
|
|
|
if (ret)
|
|
|
- goto error_put_reg;
|
|
|
+ return ret;
|
|
|
|
|
|
ret = regulator_get_voltage(reg);
|
|
|
if (ret < 0)
|
|
@@ -233,7 +233,7 @@ static int ad5446_probe(struct device *dev, const char *name,
|
|
|
voltage_uv = ret;
|
|
|
}
|
|
|
|
|
|
- indio_dev = iio_device_alloc(sizeof(*st));
|
|
|
+ indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
|
|
|
if (indio_dev == NULL) {
|
|
|
ret = -ENOMEM;
|
|
|
goto error_disable_reg;
|
|
@@ -264,19 +264,13 @@ static int ad5446_probe(struct device *dev, const char *name,
|
|
|
|
|
|
ret = iio_device_register(indio_dev);
|
|
|
if (ret)
|
|
|
- goto error_free_device;
|
|
|
+ goto error_disable_reg;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-error_free_device:
|
|
|
- iio_device_free(indio_dev);
|
|
|
error_disable_reg:
|
|
|
if (!IS_ERR(reg))
|
|
|
regulator_disable(reg);
|
|
|
-error_put_reg:
|
|
|
- if (!IS_ERR(reg))
|
|
|
- regulator_put(reg);
|
|
|
-
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -286,11 +280,8 @@ static int ad5446_remove(struct device *dev)
|
|
|
struct ad5446_state *st = iio_priv(indio_dev);
|
|
|
|
|
|
iio_device_unregister(indio_dev);
|
|
|
- if (!IS_ERR(st->reg)) {
|
|
|
+ if (!IS_ERR(st->reg))
|
|
|
regulator_disable(st->reg);
|
|
|
- regulator_put(st->reg);
|
|
|
- }
|
|
|
- iio_device_free(indio_dev);
|
|
|
|
|
|
return 0;
|
|
|
}
|