staging:iio: rework of attribute registration.

This set also includes quite a number of bug fixes of particularly
remove functions.

Necessary due to issue pointed out in Bart Van Assche's patch:
docs/driver-model: Document device.groups

V2: Rebase due to patch reordering.
V3: Pull various error fixes and cleanups out into their own patches.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <Michael.Hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

4 files changed, 24 insertions, 37 deletions

diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index bccc5798fa5..8cf7308874b 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -513,7 +513,7 @@ static const struct iio_info ade7753_info = {
 
 static int __devinit ade7753_probe(struct spi_device *spi)
 {
-        int ret, regdone = 0;
+        int ret;
         struct ade7753_state *st;
         struct iio_dev *indio_dev;
 
@@ -535,22 +535,19 @@ static int __devinit ade7753_probe(struct spi_device *spi)
         indio_dev->info = &ade7753_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = iio_device_register(indio_dev);
+        /* Get the device into a sane initial state */
+        ret = ade7753_initial_setup(indio_dev);
         if (ret)
                 goto error_free_dev;
-        regdone = 1;
 
-        /* Get the device into a sane initial state */
-        ret = ade7753_initial_setup(indio_dev);
+        ret = iio_device_register(indio_dev);
         if (ret)
                 goto error_free_dev;
+
         return 0;
 
 error_free_dev:
-        if (regdone)
-                iio_device_unregister(indio_dev);
-        else
-                iio_free_device(indio_dev);
+        iio_free_device(indio_dev);
 
 error_ret:
         return ret;
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 6f0f464aba3..8adb2a98bb3 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -536,7 +536,7 @@ static const struct iio_info ade7754_info = {
 
 static int __devinit ade7754_probe(struct spi_device *spi)
 {
-        int ret, regdone = 0;
+        int ret;
         struct ade7754_state *st;
         struct iio_dev *indio_dev;
 
@@ -558,22 +558,18 @@ static int __devinit ade7754_probe(struct spi_device *spi)
         indio_dev->info = &ade7754_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = iio_device_register(indio_dev);
-        if (ret)
-                goto error_free_dev;
-        regdone = 1;
-
         /* Get the device into a sane initial state */
         ret = ade7754_initial_setup(indio_dev);
         if (ret)
                 goto error_free_dev;
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_free_dev;
+
         return 0;
 
 error_free_dev:
-        if (regdone)
-                iio_device_unregister(indio_dev);
-        else
-                iio_free_device(indio_dev);
+        iio_free_device(indio_dev);
 
 error_ret:
         return ret;
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index ce513bda021..7cbf1cb198f 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -733,7 +733,7 @@ static const struct iio_info ade7758_info = {
 
 static int __devinit ade7758_probe(struct spi_device *spi)
 {
-        int i, ret, regdone = 0;
+        int i, ret;
         struct ade7758_state *st;
         struct iio_dev *indio_dev = iio_allocate_device(sizeof(*st));
 
@@ -775,11 +775,6 @@ static int __devinit ade7758_probe(struct spi_device *spi)
         if (ret)
                 goto error_free_tx;
 
-        ret = iio_device_register(indio_dev);
-        if (ret)
-                goto error_unreg_ring_funcs;
-        regdone = 1;
-
         ret = iio_ring_buffer_register(indio_dev,
                                        &ade7758_channels[0],
                                        ARRAY_SIZE(ade7758_channels));
@@ -796,9 +791,13 @@ static int __devinit ade7758_probe(struct spi_device *spi)
         if (spi->irq) {
                 ret = ade7758_probe_trigger(indio_dev);
                 if (ret)
-                        goto error_remove_trigger;
+                        goto error_uninitialize_ring;
         }
 
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_remove_trigger;
+
         return 0;
 
 error_remove_trigger:
@@ -813,10 +812,7 @@ error_free_tx:
 error_free_rx:
         kfree(st->rx);
 error_free_dev:
-        if (regdone)
-                iio_device_unregister(indio_dev);
-        else
-                iio_free_device(indio_dev);
+        iio_free_device(indio_dev);
 error_ret:
         return ret;
 }
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index 31723e8e64f..8e44e46d82a 100644
--- a/drivers/staging/iio/meter/ade7759.c
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -480,19 +480,17 @@ static int __devinit ade7759_probe(struct spi_device *spi)
         indio_dev->info = &ade7759_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        ret = iio_device_register(indio_dev);
+        /* Get the device into a sane initial state */
+        ret = ade7759_initial_setup(indio_dev);
         if (ret)
                 goto error_free_dev;
 
-        /* Get the device into a sane initial state */
-        ret = ade7759_initial_setup(indio_dev);
+        ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_unreg_dev;
-        return 0;
+                goto error_free_dev;
 
+        return 0;
 
-error_unreg_dev:
-        iio_device_unregister(indio_dev);
 error_free_dev:
         iio_free_device(indio_dev);
 error_ret: