public inbox for linux-iio@vger.kernel.org
 help / color / mirror / Atom feed
From: "Nuno Sá" <nuno.sa@analog.com>
To: <linux-iio@vger.kernel.org>, <devel@driverdev.osuosl.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
	Michael Hennerich <Michael.Hennerich@analog.com>,
	Jonathan Cameron <jic23@kernel.org>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	Dragos Bogdan <dragos.bogdan@analog.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Alexandru Ardelean --dry-run <alexandru.ardelean@analog.com>
Subject: [PATCH 05/10] iio: adis16400: Use Managed device functions
Date: Tue, 15 Sep 2020 11:33:40 +0200	[thread overview]
Message-ID: <20200915093345.85614-6-nuno.sa@analog.com> (raw)
In-Reply-To: <20200915093345.85614-1-nuno.sa@analog.com>

Use the adis managed device functions to setup the buffer and the trigger.
The ultimate goal will be to completely drop the non devm version from
the lib.

Signed-off-by: Nuno Sá <nuno.sa@analog.com>
---
 drivers/iio/imu/adis16400.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/iio/imu/adis16400.c b/drivers/iio/imu/adis16400.c
index 1ebe3e50d3e6..7bf4b0065022 100644
--- a/drivers/iio/imu/adis16400.c
+++ b/drivers/iio/imu/adis16400.c
@@ -1201,37 +1201,30 @@ static int adis16400_probe(struct spi_device *spi)
 	if (ret)
 		return ret;
 
-	ret = adis_setup_buffer_and_trigger(&st->adis, indio_dev,
-			adis16400_trigger_handler);
+	ret = devm_adis_setup_buffer_and_trigger(&st->adis, indio_dev, adis16400_trigger_handler);
 	if (ret)
 		return ret;
 
 	/* Get the device into a sane initial state */
 	ret = adis16400_initial_setup(indio_dev);
 	if (ret)
-		goto error_cleanup_buffer;
+		return ret;
+
 	ret = iio_device_register(indio_dev);
 	if (ret)
-		goto error_cleanup_buffer;
+		return ret;
 
 	adis16400_debugfs_init(indio_dev);
 	return 0;
-
-error_cleanup_buffer:
-	adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
-	return ret;
 }
 
 static int adis16400_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
-	struct adis16400_state *st = iio_priv(indio_dev);
 
 	iio_device_unregister(indio_dev);
 	adis16400_stop_device(indio_dev);
 
-	adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
-
 	return 0;
 }
 
-- 
2.28.0


  parent reply	other threads:[~2020-09-15  9:32 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15  9:33 [PATCH 00/10] Use ADIS devm functions for trigger/buffer setup Nuno Sá
2020-09-15  9:33 ` [PATCH 01/10] iio: adis16201: Use Managed device functions Nuno Sá
2020-09-15 10:05   ` Jonathan Cameron
2020-09-15  9:33 ` [PATCH 02/10] iio: adis16209: " Nuno Sá
2020-09-15  9:33 ` [PATCH 03/10] iio: adis16136: " Nuno Sá
2020-09-15 10:06   ` Jonathan Cameron
2020-09-15  9:33 ` [PATCH 04/10] iio: adis16260: " Nuno Sá
2020-09-15  9:33 ` Nuno Sá [this message]
2020-09-15  9:33 ` [PATCH 06/10] iio: adis16460: " Nuno Sá
2020-09-15  9:33 ` [PATCH 07/10] iio: adis16480: " Nuno Sá
2020-09-15 10:07   ` Jonathan Cameron
2020-09-15  9:33 ` [PATCH 08/10] staging: iio: adis16203: " Nuno Sá
2020-09-15  9:33 ` [PATCH 09/10] staging: iio: adis16240: " Nuno Sá
2020-09-15  9:33 ` [PATCH 10/10] iio: adis: Drop non " Nuno Sá
2020-09-15 10:10   ` Jonathan Cameron
2020-09-15 10:20     ` Sa, Nuno
2020-09-15 10:26       ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200915093345.85614-6-nuno.sa@analog.com \
    --to=nuno.sa@analog.com \
    --cc=Michael.Hennerich@analog.com \
    --cc=alexandru.ardelean@analog.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dragos.bogdan@analog.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox