staging:iio:ade7754: Do not return a error in remove function

In the Linux device driver model the remove callback is not allowed to fail and
the device will be removed regardless of the return value of the remove
callback. So if we abort in the remove function and do not free all resources we
will create a resource leak. Also all kinds of undefined behaviour are expected
to happen since the IIO device is still there while its parent is already gone.

The error which the driver tries to handle in the remove function is
non-critical, so we can just ignore it and continue to free all resources and
remove the IIO device.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 7dea7fdb9a61f78d6c4619bc736fed44a61f4d24..76e0adee96ea752f1d9576ced7d21a9c149404cc 100644 (file)
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -579,19 +579,13 @@ error_ret:
 /* fixme, confirm ordering in this function */
 static int __devexit ade7754_remove(struct spi_device *spi)
 {
-       int ret;
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
        iio_device_unregister(indio_dev);
-       ret = ade7754_stop_device(&(indio_dev->dev));
-       if (ret)
-               goto err_ret;
-
+       ade7754_stop_device(&indio_dev->dev);
        iio_device_free(indio_dev);
 
-err_ret:
-       return ret;
-
+       return 0;
 }
 
 static struct spi_driver ade7754_driver = {