From: Jonathan Cameron <jic23@kernel.org>
To: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 7/9] iio: adc: at91_adc: use devm_input_allocate_device
Date: Sat, 14 Nov 2020 17:13:40 +0000 [thread overview]
Message-ID: <20201114171340.2bf0d61e@archlinux> (raw)
In-Reply-To: <20201113212650.507680-8-alexandre.belloni@bootlin.com>
On Fri, 13 Nov 2020 22:26:48 +0100
Alexandre Belloni <alexandre.belloni@bootlin.com> wrote:
> Use devm_input_allocate_device to allocate the input device to simplify the
> error and remove paths.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This one I'm less keen on. Whilst it's obviously not a problem in
this particular case I'd ideally like to keep the remove order
as the exact reverse of probe - that makes it easy to review changes
quickly.
Now, you could easily enough make this fine by using devm for the
other items that happen before this (dev_add_action_or_reset needed
in a few cases).
Jonathan
> ---
> drivers/iio/adc/at91_adc.c | 25 +++----------------------
> 1 file changed, 3 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> index 76aeebce6f4d..d09ceb315c5a 100644
> --- a/drivers/iio/adc/at91_adc.c
> +++ b/drivers/iio/adc/at91_adc.c
> @@ -937,9 +937,8 @@ static int at91_ts_register(struct iio_dev *idev,
> {
> struct at91_adc_state *st = iio_priv(idev);
> struct input_dev *input;
> - int ret;
>
> - input = input_allocate_device();
> + input = devm_input_allocate_device(&pdev->dev);
> if (!input) {
> dev_err(&idev->dev, "Failed to allocate TS device!\n");
> return -ENOMEM;
> @@ -964,8 +963,7 @@ static int at91_ts_register(struct iio_dev *idev,
> if (st->touchscreen_type != ATMEL_ADC_TOUCHSCREEN_4WIRE) {
> dev_err(&pdev->dev,
> "This touchscreen controller only support 4 wires\n");
> - ret = -EINVAL;
> - goto err;
> + return -EINVAL;
> }
>
> input_set_abs_params(input, ABS_X, 0, (1 << MAX_RLPOS_BITS) - 1,
> @@ -977,20 +975,7 @@ static int at91_ts_register(struct iio_dev *idev,
> st->ts_input = input;
> input_set_drvdata(input, st);
>
> - ret = input_register_device(input);
> - if (ret)
> - goto err;
> -
> - return ret;
> -
> -err:
> - input_free_device(st->ts_input);
> - return ret;
> -}
> -
> -static void at91_ts_unregister(struct at91_adc_state *st)
> -{
> - input_unregister_device(st->ts_input);
> + return input_register_device(input);
> }
>
> static int at91_adc_probe(struct platform_device *pdev)
> @@ -1203,8 +1188,6 @@ static int at91_adc_probe(struct platform_device *pdev)
> if (!st->touchscreen_type) {
> at91_adc_trigger_remove(idev);
> at91_adc_buffer_remove(idev);
> - } else {
> - at91_ts_unregister(st);
> }
> error_disable_adc_clk:
> clk_disable_unprepare(st->adc_clk);
> @@ -1224,8 +1207,6 @@ static int at91_adc_remove(struct platform_device *pdev)
> if (!st->touchscreen_type) {
> at91_adc_trigger_remove(idev);
> at91_adc_buffer_remove(idev);
> - } else {
> - at91_ts_unregister(st);
> }
> clk_disable_unprepare(st->adc_clk);
> clk_disable_unprepare(st->clk);
next prev parent reply other threads:[~2020-11-14 17:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 21:26 [PATCH 0/9] iio: adc: at91_adc: cleanup DT bindings Alexandre Belloni
2020-11-13 21:26 ` [PATCH 1/9] iio: adc: at91_adc: remove platform data Alexandre Belloni
2020-11-13 21:26 ` [PATCH 2/9] iio: adc: at91_adc: rework resolution selection Alexandre Belloni
2020-11-14 16:59 ` Jonathan Cameron
2020-11-13 21:26 ` [PATCH 3/9] dt-bindings:iio:adc:atmel,sama9260-adc: conversion to yaml from at91_adc.txt Alexandre Belloni
2020-11-14 16:53 ` Jonathan Cameron
2020-11-13 21:26 ` [PATCH 4/9] iio: adc: at91_adc: rework trigger definition Alexandre Belloni
2020-11-14 17:02 ` Jonathan Cameron
2020-11-14 19:16 ` Alexandre Belloni
2020-11-13 21:26 ` [PATCH 5/9] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe Alexandre Belloni
2020-11-14 17:08 ` Jonathan Cameron
2020-11-14 17:15 ` Jonathan Cameron
2020-11-14 19:19 ` Alexandre Belloni
2020-11-13 21:26 ` [PATCH 6/9] iio: adc: at91_adc: remove forward declaration Alexandre Belloni
2020-11-14 17:09 ` Jonathan Cameron
2020-11-13 21:26 ` [PATCH 7/9] iio: adc: at91_adc: use devm_input_allocate_device Alexandre Belloni
2020-11-14 17:13 ` Jonathan Cameron [this message]
2020-11-14 19:22 ` Alexandre Belloni
2020-11-13 21:26 ` [PATCH 8/9] ARM: dts: at91: sama5d3: use proper ADC compatible Alexandre Belloni
2020-11-13 21:26 ` [PATCH 9/9] ARM: dts: at91: remove deprecated ADC properties Alexandre Belloni
2020-11-14 17:17 ` [PATCH 0/9] iio: adc: at91_adc: cleanup DT bindings Jonathan Cameron
2020-11-16 6:32 ` Ludovic Desroches
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=20201114171340.2bf0d61e@archlinux \
--to=jic23@kernel.org \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=nicolas.ferre@microchip.com \
--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;
as well as URLs for NNTP newsgroup(s).