diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-09-11 10:55:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-09-14 11:58:34 +0100 |
| commit | b909459f1557f62d2af7eee5f080ac0b540923e7 (patch) | |
| tree | 76b90198f95442b1f6a7360532d45e0658786e55 /drivers/staging/iio/meter/ade7854.c | |
| parent | b67637a3e70c61a9197bd9272760388d888c2cf3 (diff) | |
| download | op-kernel-dev-b909459f1557f62d2af7eee5f080ac0b540923e7.zip op-kernel-dev-b909459f1557f62d2af7eee5f080ac0b540923e7.tar.gz | |
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.c')
| -rw-r--r-- | drivers/staging/iio/meter/ade7854.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c index 8e068ab..d620bbd 100644 --- a/drivers/staging/iio/meter/ade7854.c +++ b/drivers/staging/iio/meter/ade7854.c @@ -550,7 +550,7 @@ int ade7854_probe(struct iio_dev *indio_dev, struct device *dev) ret = iio_device_register(indio_dev); if (ret) - goto error_free_dev; + return ret; /* Get the device into a sane initial state */ ret = ade7854_initial_setup(indio_dev); @@ -561,9 +561,6 @@ int ade7854_probe(struct iio_dev *indio_dev, struct device *dev) error_unreg_dev: iio_device_unregister(indio_dev); -error_free_dev: - iio_device_free(indio_dev); - return ret; } EXPORT_SYMBOL(ade7854_probe); @@ -571,7 +568,6 @@ EXPORT_SYMBOL(ade7854_probe); int ade7854_remove(struct iio_dev *indio_dev) { iio_device_unregister(indio_dev); - iio_device_free(indio_dev); return 0; } |
