aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/meter/ade7854-i2c.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-11 10:55:00 +0100
committerJonathan Cameron <jic23@kernel.org>2013-09-14 11:58:34 +0100
commitb909459f1557f62d2af7eee5f080ac0b540923e7 (patch)
tree76b90198f95442b1f6a7360532d45e0658786e55 /drivers/staging/iio/meter/ade7854-i2c.c
parentstaging: iio: ade7759: Use devm_iio_device_alloc (diff)
downloadlinux-dev-b909459f1557f62d2af7eee5f080ac0b540923e7.tar.xz
linux-dev-b909459f1557f62d2af7eee5f080ac0b540923e7.zip
staging: iio: ade7854: Use devm_iio_device_alloc
devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Barry Song <21cnbao@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio/meter/ade7854-i2c.c')
-rw-r--r--drivers/staging/iio/meter/ade7854-i2c.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c
index db9ef6c86c1e..5b33c7f1aa91 100644
--- a/drivers/staging/iio/meter/ade7854-i2c.c
+++ b/drivers/staging/iio/meter/ade7854-i2c.c
@@ -208,7 +208,7 @@ static int ade7854_i2c_probe(struct i2c_client *client,
struct ade7854_state *st;
struct iio_dev *indio_dev;
- indio_dev = iio_device_alloc(sizeof(*st));
+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
if (indio_dev == NULL)
return -ENOMEM;
st = iio_priv(indio_dev);
@@ -225,8 +225,6 @@ static int ade7854_i2c_probe(struct i2c_client *client,
st->irq = client->irq;
ret = ade7854_probe(indio_dev, &client->dev);
- if (ret)
- iio_device_free(indio_dev);
return ret;
}