From: Alexandru Ardelean <aardelean@deviqon.com>
To: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org
Cc: jic23@kernel.org, hdegoede@redhat.com, wens@csie.org,
andriy.shevchenko@linux.intel.com,
Alexandru Ardelean <aardelean@deviqon.com>
Subject: [PATCH 3/5] iio: adc: axp288_adc: convert probe to full device-managed
Date: Fri, 3 Sep 2021 10:29:15 +0300 [thread overview]
Message-ID: <20210903072917.45769-4-aardelean@deviqon.com> (raw)
In-Reply-To: <20210903072917.45769-1-aardelean@deviqon.com>
This change converts the probe of this driver to use device-managed
functions only, which means that the remove hook can be removed.
The remove hook has only 2 calls to iio_device_unregister() and
iio_map_array_unregister(). Both these can now be done via devm register
functions, now that there's also a devm_iio_map_array_register() function.
The platform_set_drvdata() can also be removed now.
This change also removes the error print for when the iio_device_register()
call fails. This isn't required now.
Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
---
drivers/iio/adc/axp288_adc.c | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c
index 5f5e8b39e4d2..a4b8be5b8f88 100644
--- a/drivers/iio/adc/axp288_adc.c
+++ b/drivers/iio/adc/axp288_adc.c
@@ -259,7 +259,7 @@ static int axp288_adc_probe(struct platform_device *pdev)
info->irq = platform_get_irq(pdev, 0);
if (info->irq < 0)
return info->irq;
- platform_set_drvdata(pdev, indio_dev);
+
info->regmap = axp20x->regmap;
/*
* Set ADC to enabled state at all time, including system suspend.
@@ -276,31 +276,12 @@ static int axp288_adc_probe(struct platform_device *pdev)
indio_dev->num_channels = ARRAY_SIZE(axp288_adc_channels);
indio_dev->info = &axp288_adc_iio_info;
indio_dev->modes = INDIO_DIRECT_MODE;
- ret = iio_map_array_register(indio_dev, axp288_adc_default_maps);
+
+ ret = devm_iio_map_array_register(&pdev->dev, indio_dev, axp288_adc_default_maps);
if (ret < 0)
return ret;
- ret = iio_device_register(indio_dev);
- if (ret < 0) {
- dev_err(&pdev->dev, "unable to register iio device\n");
- goto err_array_unregister;
- }
- return 0;
-
-err_array_unregister:
- iio_map_array_unregister(indio_dev);
-
- return ret;
-}
-
-static int axp288_adc_remove(struct platform_device *pdev)
-{
- struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-
- iio_device_unregister(indio_dev);
- iio_map_array_unregister(indio_dev);
-
- return 0;
+ return devm_iio_device_register(&pdev->dev, indio_dev);
}
static const struct platform_device_id axp288_adc_id_table[] = {
@@ -310,7 +291,6 @@ static const struct platform_device_id axp288_adc_id_table[] = {
static struct platform_driver axp288_adc_driver = {
.probe = axp288_adc_probe,
- .remove = axp288_adc_remove,
.id_table = axp288_adc_id_table,
.driver = {
.name = "axp288_adc",
--
2.31.1
next prev parent reply other threads:[~2021-09-03 7:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 7:29 [PATCH 0/5] iio: device-managed conversions with devm_iio_map_array_register() Alexandru Ardelean
2021-09-03 7:29 ` [PATCH 1/5] iio: inkern: introduce devm_iio_map_array_register() short-hand function Alexandru Ardelean
2021-09-03 13:40 ` Andy Shevchenko
2021-09-03 13:56 ` Alexandru Ardelean
2021-09-05 11:08 ` Jonathan Cameron
2021-09-03 7:29 ` [PATCH 2/5] iio: adc: intel_mrfld_adc: convert probe to full device-managed Alexandru Ardelean
2021-09-03 13:22 ` Andy Shevchenko
2021-09-03 7:29 ` Alexandru Ardelean [this message]
2021-09-03 8:00 ` [PATCH 3/5] iio: adc: axp288_adc: " Hans de Goede
2021-09-03 7:29 ` [PATCH 4/5] iio: adc: lp8788_adc: convert probe to full-device managed Alexandru Ardelean
2021-09-03 7:29 ` [PATCH 5/5] iio: adc: da9150-gpadc: " Alexandru Ardelean
2021-09-26 15:20 ` [PATCH 0/5] iio: device-managed conversions with devm_iio_map_array_register() 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=20210903072917.45769-4-aardelean@deviqon.com \
--to=aardelean@deviqon.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=jic23@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wens@csie.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).