From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out-051.synserver.de ([212.40.185.51]:1043 "EHLO smtp-out-051.synserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754516Ab2IVIz7 (ORCPT ); Sat, 22 Sep 2012 04:55:59 -0400 From: Lars-Peter Clausen To: Jonathan Cameron Cc: linux-iio@vger.kernel.org, Lars-Peter Clausen Subject: [PATCH 4/8] staging:iio:ade7754: Do not return a error in remove function Date: Sat, 22 Sep 2012 10:56:34 +0200 Message-Id: <1348304198-5793-4-git-send-email-lars@metafoo.de> In-Reply-To: <1348304198-5793-1-git-send-email-lars@metafoo.de> References: <1348304198-5793-1-git-send-email-lars@metafoo.de> Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org 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 --- drivers/staging/iio/meter/ade7754.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c index 7dea7fd..76e0ade 100644 --- 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 = { -- 1.7.10.4