Skip to content

Commit

Permalink
iio: dac: Convert ad5380 to devm_regmap_* APIs
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Axel Lin authored and Greg Kroah-Hartman committed Jun 15, 2012
1 parent 4d9505a commit d03fcfe
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/iio/dac/ad5380.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap,
if (indio_dev == NULL) {
dev_err(dev, "Failed to allocate iio device\n");
ret = -ENOMEM;
goto error_regmap_exit;
goto error_out;
}

st = iio_priv(indio_dev);
Expand Down Expand Up @@ -436,8 +436,7 @@ static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap,
kfree(indio_dev->channels);
error_free:
iio_device_free(indio_dev);
error_regmap_exit:
regmap_exit(regmap);
error_out:

return ret;
}
Expand All @@ -456,7 +455,6 @@ static int __devexit ad5380_remove(struct device *dev)
regulator_put(st->vref_reg);
}

regmap_exit(st->regmap);
iio_device_free(indio_dev);

return 0;
Expand Down Expand Up @@ -485,7 +483,7 @@ static int __devinit ad5380_spi_probe(struct spi_device *spi)
const struct spi_device_id *id = spi_get_device_id(spi);
struct regmap *regmap;

regmap = regmap_init_spi(spi, &ad5380_regmap_config);
regmap = devm_regmap_init_spi(spi, &ad5380_regmap_config);

if (IS_ERR(regmap))
return PTR_ERR(regmap);
Expand Down Expand Up @@ -559,7 +557,7 @@ static int __devinit ad5380_i2c_probe(struct i2c_client *i2c,
{
struct regmap *regmap;

regmap = regmap_init_i2c(i2c, &ad5380_regmap_config);
regmap = devm_regmap_init_i2c(i2c, &ad5380_regmap_config);

if (IS_ERR(regmap))
return PTR_ERR(regmap);
Expand Down

0 comments on commit d03fcfe

Please sign in to comment.