From: Liam Beguin <liambeguin@gmail.com>
To: liambeguin@gmail.com, lars@metafoo.de,
Michael.Hennerich@analog.com, jic23@kernel.org,
charles-antoine.couret@essensium.com, Nuno.Sa@analog.com
Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
devicetree@vger.kernel.org, robh+dt@kernel.org
Subject: [PATCH v6 5/5] iio: adc: ad7949: use devm managed functions
Date: Sun, 15 Aug 2021 17:33:09 -0400 [thread overview]
Message-ID: <20210815213309.2847711-6-liambeguin@gmail.com> (raw)
In-Reply-To: <20210815213309.2847711-1-liambeguin@gmail.com>
From: Liam Beguin <lvb@xiphos.com>
Switch to devm_iio_device_register to finalize devm migration.
This removes the use for iio_device_unregister() and since
mutex_destroy() is not necessary here, remove it altogether.
Signed-off-by: Liam Beguin <lvb@xiphos.com>
---
drivers/iio/adc/ad7949.c | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/drivers/iio/adc/ad7949.c b/drivers/iio/adc/ad7949.c
index 5168d687687d..5b8858719b53 100644
--- a/drivers/iio/adc/ad7949.c
+++ b/drivers/iio/adc/ad7949.c
@@ -405,34 +405,16 @@ static int ad7949_spi_probe(struct spi_device *spi)
ret = ad7949_spi_init(ad7949_adc);
if (ret) {
dev_err(dev, "enable to init this device: %d\n", ret);
- goto err;
+ return ret;
}
- ret = iio_device_register(indio_dev);
- if (ret) {
+ ret = devm_iio_device_register(dev, indio_dev);
+ if (ret)
dev_err(dev, "fail to register iio device: %d\n", ret);
- goto err;
- }
-
- return 0;
-
-err:
- mutex_destroy(&ad7949_adc->lock);
return ret;
}
-static int ad7949_spi_remove(struct spi_device *spi)
-{
- struct iio_dev *indio_dev = spi_get_drvdata(spi);
- struct ad7949_adc_chip *ad7949_adc = iio_priv(indio_dev);
-
- iio_device_unregister(indio_dev);
- mutex_destroy(&ad7949_adc->lock);
-
- return 0;
-}
-
static const struct of_device_id ad7949_spi_of_id[] = {
{ .compatible = "adi,ad7949" },
{ .compatible = "adi,ad7682" },
@@ -455,7 +437,6 @@ static struct spi_driver ad7949_spi_driver = {
.of_match_table = ad7949_spi_of_id,
},
.probe = ad7949_spi_probe,
- .remove = ad7949_spi_remove,
.id_table = ad7949_spi_id,
};
module_spi_driver(ad7949_spi_driver);
--
2.32.0.452.g940fe202adcb
next prev parent reply other threads:[~2021-08-15 21:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-15 21:33 [PATCH v6 0/5] AD7949 Fixes Liam Beguin
2021-08-15 21:33 ` [PATCH v6 1/5] iio: adc: ad7949: define and use bitfield names Liam Beguin
2021-08-15 21:33 ` [PATCH v6 2/5] iio: adc: ad7949: fix spi messages on non 14-bit controllers Liam Beguin
2021-08-29 14:33 ` Jonathan Cameron
2021-08-29 16:43 ` Liam Beguin
2021-08-15 21:33 ` [PATCH v6 3/5] iio: adc: ad7949: add vref selection support Liam Beguin
2021-08-16 8:04 ` Andy Shevchenko
2021-08-16 12:39 ` Liam Beguin
2021-08-16 12:48 ` Andy Shevchenko
2021-08-16 13:07 ` Liam Beguin
2021-08-16 13:12 ` Andy Shevchenko
2021-08-29 14:35 ` Jonathan Cameron
2021-08-29 16:40 ` Liam Beguin
2021-08-15 21:33 ` [PATCH v6 4/5] dt-bindings: iio: adc: ad7949: update voltage reference bindings Liam Beguin
2021-08-17 22:16 ` Rob Herring
2021-08-15 21:33 ` Liam Beguin [this message]
2021-08-16 8:08 ` [PATCH v6 0/5] AD7949 Fixes Andy Shevchenko
2021-08-16 12:59 ` Liam Beguin
2021-08-29 14:38 ` 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=20210815213309.2847711-6-liambeguin@gmail.com \
--to=liambeguin@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=Nuno.Sa@analog.com \
--cc=charles-antoine.couret@essensium.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.