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 5/9] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe Date: Sat, 14 Nov 2020 17:08:04 +0000 [thread overview] Message-ID: <20201114170804.4b51c84b@archlinux> (raw) In-Reply-To: <20201113212650.507680-6-alexandre.belloni@bootlin.com> On Fri, 13 Nov 2020 22:26:46 +0100 Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > at91_adc_probe_dt is now small enough to be merged back in at91_adc_probe. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Minor largely unrelated suggestion inline as we are touching this code. Thanks, Jonathan > --- > drivers/iio/adc/at91_adc.c | 118 +++++++++++++++---------------------- > 1 file changed, 49 insertions(+), 69 deletions(-) > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > index 83539422b704..9f05eb722f5e 100644 > --- a/drivers/iio/adc/at91_adc.c > +++ b/drivers/iio/adc/at91_adc.c > @@ -833,70 +833,6 @@ static int at91_adc_probe_dt_ts(struct device_node *node, > } > } > > -static int at91_adc_probe_dt(struct iio_dev *idev, > - struct platform_device *pdev) > -{ > - struct at91_adc_state *st = iio_priv(idev); > - struct device_node *node = pdev->dev.of_node; > - int ret; > - u32 prop; > - char *s; > - > - st->caps = (struct at91_adc_caps *) > - of_match_device(at91_adc_dt_ids, &pdev->dev)->data; > - > - st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); > - > - if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { > - dev_err(&idev->dev, "Missing adc-channels-used property in the DT.\n"); > - ret = -EINVAL; > - goto error_ret; > - } > - st->channels_mask = prop; > - > - st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); > - > - if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { > - dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); > - ret = -EINVAL; > - goto error_ret; > - } > - st->startup_time = prop; > - > - prop = 0; > - of_property_read_u32(node, "atmel,adc-sample-hold-time", &prop); > - st->sample_hold_time = prop; > - > - if (of_property_read_u32(node, "atmel,adc-vref", &prop)) { > - dev_err(&idev->dev, "Missing adc-vref property in the DT.\n"); > - ret = -EINVAL; > - goto error_ret; > - } > - st->vref_mv = prop; > - > - st->res = st->caps->high_res_bits; > - if (st->caps->low_res_bits && > - !of_property_read_string(node, "atmel,adc-use-res", (const char **)&s) > - && !strcmp(s, "lowres")) > - st->res = st->caps->low_res_bits; > - > - dev_info(&idev->dev, "Resolution used: %u bits\n", st->res); > - > - st->registers = &st->caps->registers; > - st->num_channels = st->caps->num_channels; > - > - /* Check if touchscreen is supported. */ > - if (st->caps->has_ts) > - return at91_adc_probe_dt_ts(node, st, &idev->dev); > - else > - dev_info(&idev->dev, "not support touchscreen in the adc compatible string.\n"); > - > - return 0; > - > -error_ret: > - return ret; > -} > - > static const struct iio_info at91_adc_info = { > .read_raw = &at91_adc_read_raw, > }; > @@ -1062,10 +998,12 @@ static void at91_ts_unregister(struct at91_adc_state *st) > static int at91_adc_probe(struct platform_device *pdev) > { > unsigned int prsc, mstrclk, ticks, adc_clk, adc_clk_khz, shtim; > + struct device_node *node = pdev->dev.of_node; > int ret; > struct iio_dev *idev; > struct at91_adc_state *st; > - u32 reg; > + u32 reg, prop; > + char *s; > > idev = devm_iio_device_alloc(&pdev->dev, sizeof(struct at91_adc_state)); > if (!idev) > @@ -1073,9 +1011,52 @@ static int at91_adc_probe(struct platform_device *pdev) > > st = iio_priv(idev); > > - ret = at91_adc_probe_dt(idev, pdev); > - if (ret) > - return ret; > + st->caps = (struct at91_adc_caps *) > + of_match_device(at91_adc_dt_ids, &pdev->dev)->data; of_device_get match_data - obviously an unrelated change but trivial enough I'd just slip it in this patch (unless you have it a later one!) That returns a void * so no need for the cast. > + > + st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); > + > + if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { > + dev_err(&idev->dev, "Missing adc-channels-used property in the DT.\n"); > + return -EINVAL; > + } > + st->channels_mask = prop; > + > + st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); > + > + if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { > + dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); > + return -EINVAL; > + } > + st->startup_time = prop; > + > + prop = 0; > + of_property_read_u32(node, "atmel,adc-sample-hold-time", &prop); > + st->sample_hold_time = prop; > + > + if (of_property_read_u32(node, "atmel,adc-vref", &prop)) { > + dev_err(&idev->dev, "Missing adc-vref property in the DT.\n"); > + return -EINVAL; > + } > + st->vref_mv = prop; > + > + st->res = st->caps->high_res_bits; > + if (st->caps->low_res_bits && > + !of_property_read_string(node, "atmel,adc-use-res", (const char **)&s) > + && !strcmp(s, "lowres")) > + st->res = st->caps->low_res_bits; > + > + dev_info(&idev->dev, "Resolution used: %u bits\n", st->res); > + > + st->registers = &st->caps->registers; > + st->num_channels = st->caps->num_channels; > + > + /* Check if touchscreen is supported. */ > + if (st->caps->has_ts) { > + ret = at91_adc_probe_dt_ts(node, st, &idev->dev); > + if (ret) > + return ret; > + } > > platform_set_drvdata(pdev, idev); > > @@ -1091,7 +1072,6 @@ static int at91_adc_probe(struct platform_device *pdev) > if (IS_ERR(st->reg_base)) > return PTR_ERR(st->reg_base); > > - Stray change that shouldn't be in this patch ideally but not that important. > /* > * Disable all IRQs before setting up the handler > */
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <jic23@kernel.org> To: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: devicetree@vger.kernel.org, Lars-Peter Clausen <lars@metafoo.de>, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ludovic Desroches <ludovic.desroches@microchip.com>, Peter Meerwald-Stadler <pmeerw@pmeerw.net>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 5/9] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe Date: Sat, 14 Nov 2020 17:08:04 +0000 [thread overview] Message-ID: <20201114170804.4b51c84b@archlinux> (raw) In-Reply-To: <20201113212650.507680-6-alexandre.belloni@bootlin.com> On Fri, 13 Nov 2020 22:26:46 +0100 Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > at91_adc_probe_dt is now small enough to be merged back in at91_adc_probe. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Minor largely unrelated suggestion inline as we are touching this code. Thanks, Jonathan > --- > drivers/iio/adc/at91_adc.c | 118 +++++++++++++++---------------------- > 1 file changed, 49 insertions(+), 69 deletions(-) > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > index 83539422b704..9f05eb722f5e 100644 > --- a/drivers/iio/adc/at91_adc.c > +++ b/drivers/iio/adc/at91_adc.c > @@ -833,70 +833,6 @@ static int at91_adc_probe_dt_ts(struct device_node *node, > } > } > > -static int at91_adc_probe_dt(struct iio_dev *idev, > - struct platform_device *pdev) > -{ > - struct at91_adc_state *st = iio_priv(idev); > - struct device_node *node = pdev->dev.of_node; > - int ret; > - u32 prop; > - char *s; > - > - st->caps = (struct at91_adc_caps *) > - of_match_device(at91_adc_dt_ids, &pdev->dev)->data; > - > - st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); > - > - if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { > - dev_err(&idev->dev, "Missing adc-channels-used property in the DT.\n"); > - ret = -EINVAL; > - goto error_ret; > - } > - st->channels_mask = prop; > - > - st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); > - > - if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { > - dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); > - ret = -EINVAL; > - goto error_ret; > - } > - st->startup_time = prop; > - > - prop = 0; > - of_property_read_u32(node, "atmel,adc-sample-hold-time", &prop); > - st->sample_hold_time = prop; > - > - if (of_property_read_u32(node, "atmel,adc-vref", &prop)) { > - dev_err(&idev->dev, "Missing adc-vref property in the DT.\n"); > - ret = -EINVAL; > - goto error_ret; > - } > - st->vref_mv = prop; > - > - st->res = st->caps->high_res_bits; > - if (st->caps->low_res_bits && > - !of_property_read_string(node, "atmel,adc-use-res", (const char **)&s) > - && !strcmp(s, "lowres")) > - st->res = st->caps->low_res_bits; > - > - dev_info(&idev->dev, "Resolution used: %u bits\n", st->res); > - > - st->registers = &st->caps->registers; > - st->num_channels = st->caps->num_channels; > - > - /* Check if touchscreen is supported. */ > - if (st->caps->has_ts) > - return at91_adc_probe_dt_ts(node, st, &idev->dev); > - else > - dev_info(&idev->dev, "not support touchscreen in the adc compatible string.\n"); > - > - return 0; > - > -error_ret: > - return ret; > -} > - > static const struct iio_info at91_adc_info = { > .read_raw = &at91_adc_read_raw, > }; > @@ -1062,10 +998,12 @@ static void at91_ts_unregister(struct at91_adc_state *st) > static int at91_adc_probe(struct platform_device *pdev) > { > unsigned int prsc, mstrclk, ticks, adc_clk, adc_clk_khz, shtim; > + struct device_node *node = pdev->dev.of_node; > int ret; > struct iio_dev *idev; > struct at91_adc_state *st; > - u32 reg; > + u32 reg, prop; > + char *s; > > idev = devm_iio_device_alloc(&pdev->dev, sizeof(struct at91_adc_state)); > if (!idev) > @@ -1073,9 +1011,52 @@ static int at91_adc_probe(struct platform_device *pdev) > > st = iio_priv(idev); > > - ret = at91_adc_probe_dt(idev, pdev); > - if (ret) > - return ret; > + st->caps = (struct at91_adc_caps *) > + of_match_device(at91_adc_dt_ids, &pdev->dev)->data; of_device_get match_data - obviously an unrelated change but trivial enough I'd just slip it in this patch (unless you have it a later one!) That returns a void * so no need for the cast. > + > + st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); > + > + if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { > + dev_err(&idev->dev, "Missing adc-channels-used property in the DT.\n"); > + return -EINVAL; > + } > + st->channels_mask = prop; > + > + st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); > + > + if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { > + dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); > + return -EINVAL; > + } > + st->startup_time = prop; > + > + prop = 0; > + of_property_read_u32(node, "atmel,adc-sample-hold-time", &prop); > + st->sample_hold_time = prop; > + > + if (of_property_read_u32(node, "atmel,adc-vref", &prop)) { > + dev_err(&idev->dev, "Missing adc-vref property in the DT.\n"); > + return -EINVAL; > + } > + st->vref_mv = prop; > + > + st->res = st->caps->high_res_bits; > + if (st->caps->low_res_bits && > + !of_property_read_string(node, "atmel,adc-use-res", (const char **)&s) > + && !strcmp(s, "lowres")) > + st->res = st->caps->low_res_bits; > + > + dev_info(&idev->dev, "Resolution used: %u bits\n", st->res); > + > + st->registers = &st->caps->registers; > + st->num_channels = st->caps->num_channels; > + > + /* Check if touchscreen is supported. */ > + if (st->caps->has_ts) { > + ret = at91_adc_probe_dt_ts(node, st, &idev->dev); > + if (ret) > + return ret; > + } > > platform_set_drvdata(pdev, idev); > > @@ -1091,7 +1072,6 @@ static int at91_adc_probe(struct platform_device *pdev) > if (IS_ERR(st->reg_base)) > return PTR_ERR(st->reg_base); > > - Stray change that shouldn't be in this patch ideally but not that important. > /* > * Disable all IRQs before setting up the handler > */ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-11-14 17:08 UTC|newest] Thread overview: 44+ 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 ` Alexandre Belloni 2020-11-13 21:26 ` [PATCH 1/9] iio: adc: at91_adc: remove platform data Alexandre Belloni 2020-11-13 21:26 ` Alexandre Belloni 2020-11-13 21:26 ` [PATCH 2/9] iio: adc: at91_adc: rework resolution selection Alexandre Belloni 2020-11-13 21:26 ` Alexandre Belloni 2020-11-14 16:59 ` Jonathan Cameron 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-13 21:26 ` [PATCH 3/9] dt-bindings:iio:adc:atmel, sama9260-adc: " Alexandre Belloni 2020-11-14 16:53 ` [PATCH 3/9] dt-bindings:iio:adc:atmel,sama9260-adc: " Jonathan Cameron 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-13 21:26 ` Alexandre Belloni 2020-11-14 17:02 ` Jonathan Cameron 2020-11-14 17:02 ` Jonathan Cameron 2020-11-14 19:16 ` Alexandre Belloni 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-13 21:26 ` Alexandre Belloni 2020-11-14 17:08 ` Jonathan Cameron [this message] 2020-11-14 17:08 ` Jonathan Cameron 2020-11-14 17:15 ` Jonathan Cameron 2020-11-14 17:15 ` Jonathan Cameron 2020-11-14 19:19 ` Alexandre Belloni 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-13 21:26 ` Alexandre Belloni 2020-11-14 17:09 ` Jonathan Cameron 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-13 21:26 ` Alexandre Belloni 2020-11-14 17:13 ` Jonathan Cameron 2020-11-14 17:13 ` Jonathan Cameron 2020-11-14 19:22 ` Alexandre Belloni 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 ` Alexandre Belloni 2020-11-13 21:26 ` [PATCH 9/9] ARM: dts: at91: remove deprecated ADC properties Alexandre Belloni 2020-11-13 21:26 ` Alexandre Belloni 2020-11-14 17:17 ` [PATCH 0/9] iio: adc: at91_adc: cleanup DT bindings Jonathan Cameron 2020-11-14 17:17 ` Jonathan Cameron 2020-11-16 6:32 ` Ludovic Desroches 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=20201114170804.4b51c84b@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: linkBe 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.