From 52ebd149d1c68b4ad1c00aab65ac58c0af18b4e7 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sat, 22 Sep 2012 09:56:00 +0100
Subject: [PATCH] --- yaml --- r: 325494 b: refs/heads/master c:
 db314a1aaa2c0aa262f24e14c81b91b09e72e470 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/iio/meter/ade7754.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9daa535cb896..0b97321aa216 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d576c7558616e3c096fca1f21531e1e50d2f27ca
+refs/heads/master: db314a1aaa2c0aa262f24e14c81b91b09e72e470
diff --git a/trunk/drivers/staging/iio/meter/ade7754.c b/trunk/drivers/staging/iio/meter/ade7754.c
index 7dea7fdb9a61..76e0adee96ea 100644
--- a/trunk/drivers/staging/iio/meter/ade7754.c
+++ b/trunk/drivers/staging/iio/meter/ade7754.c
@@ -579,19 +579,13 @@ static int __devinit ade7754_probe(struct spi_device *spi)
 /* 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 = {