Re: [PATCH 5/9] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe
From: Jonathan Cameron
Date: Sat Nov 14 2020 - 12:15:10 EST
On Sat, 14 Nov 2020 17:08:04 +0000
Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
> On Fri, 13 Nov 2020 22:26:46 +0100
> Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx> wrote:
>
> > at91_adc_probe_dt is now small enough to be merged back in at91_adc_probe.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
> Minor largely unrelated suggestion inline as we are touching this code.
>
Ignore that, you do it in the next patch which is better anyway :)
Jonathan
> 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
> > */
>