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 6/9] iio: adc: at91_adc: remove forward declaration Date: Sat, 14 Nov 2020 17:09:08 +0000 [thread overview] Message-ID: <20201114170908.234f0141@archlinux> (raw) In-Reply-To: <20201113212650.507680-7-alexandre.belloni@bootlin.com> On Fri, 13 Nov 2020 22:26:47 +0100 Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > Remove the forward declaration of at91_adc_dt_ids by using > device_get_match_data. Also add const were possible since it is not > discarded by the cast anymore. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Ignore comment on previous patch ;) Jonathan > --- > drivers/iio/adc/at91_adc.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > index 9f05eb722f5e..76aeebce6f4d 100644 > --- a/drivers/iio/adc/at91_adc.c > +++ b/drivers/iio/adc/at91_adc.c > @@ -224,7 +224,6 @@ struct at91_adc_state { > struct mutex lock; > u8 num_channels; > void __iomem *reg_base; > - struct at91_adc_reg_desc *registers; > u32 startup_time; > u8 sample_hold_time; > bool sleep_mode; > @@ -233,7 +232,8 @@ struct at91_adc_state { > u32 vref_mv; > u32 res; /* resolution used for convertions */ > wait_queue_head_t wq_data_avail; > - struct at91_adc_caps *caps; > + const struct at91_adc_caps *caps; > + const struct at91_adc_reg_desc *registers; > > /* > * Following ADC channels are shared by touchscreen: > @@ -569,7 +569,7 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) > { > struct iio_dev *idev = iio_trigger_get_drvdata(trig); > struct at91_adc_state *st = iio_priv(idev); > - struct at91_adc_reg_desc *reg = st->registers; > + const struct at91_adc_reg_desc *reg = st->registers; > u32 status = at91_adc_readl(st, reg->trigger_register); > int value; > u8 bit; > @@ -796,8 +796,6 @@ static u32 calc_startup_ticks_9x5(u32 startup_time, u32 adc_clk_khz) > return ticks; > } > > -static const struct of_device_id at91_adc_dt_ids[]; > - > static int at91_adc_probe_dt_ts(struct device_node *node, > struct at91_adc_state *st, struct device *dev) > { > @@ -1011,8 +1009,7 @@ static int at91_adc_probe(struct platform_device *pdev) > > st = iio_priv(idev); > > - st->caps = (struct at91_adc_caps *) > - of_match_device(at91_adc_dt_ids, &pdev->dev)->data; > + st->caps = device_get_match_data(&pdev->dev); > > st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); >
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 6/9] iio: adc: at91_adc: remove forward declaration Date: Sat, 14 Nov 2020 17:09:08 +0000 [thread overview] Message-ID: <20201114170908.234f0141@archlinux> (raw) In-Reply-To: <20201113212650.507680-7-alexandre.belloni@bootlin.com> On Fri, 13 Nov 2020 22:26:47 +0100 Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > Remove the forward declaration of at91_adc_dt_ids by using > device_get_match_data. Also add const were possible since it is not > discarded by the cast anymore. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Ignore comment on previous patch ;) Jonathan > --- > drivers/iio/adc/at91_adc.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > index 9f05eb722f5e..76aeebce6f4d 100644 > --- a/drivers/iio/adc/at91_adc.c > +++ b/drivers/iio/adc/at91_adc.c > @@ -224,7 +224,6 @@ struct at91_adc_state { > struct mutex lock; > u8 num_channels; > void __iomem *reg_base; > - struct at91_adc_reg_desc *registers; > u32 startup_time; > u8 sample_hold_time; > bool sleep_mode; > @@ -233,7 +232,8 @@ struct at91_adc_state { > u32 vref_mv; > u32 res; /* resolution used for convertions */ > wait_queue_head_t wq_data_avail; > - struct at91_adc_caps *caps; > + const struct at91_adc_caps *caps; > + const struct at91_adc_reg_desc *registers; > > /* > * Following ADC channels are shared by touchscreen: > @@ -569,7 +569,7 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) > { > struct iio_dev *idev = iio_trigger_get_drvdata(trig); > struct at91_adc_state *st = iio_priv(idev); > - struct at91_adc_reg_desc *reg = st->registers; > + const struct at91_adc_reg_desc *reg = st->registers; > u32 status = at91_adc_readl(st, reg->trigger_register); > int value; > u8 bit; > @@ -796,8 +796,6 @@ static u32 calc_startup_ticks_9x5(u32 startup_time, u32 adc_clk_khz) > return ticks; > } > > -static const struct of_device_id at91_adc_dt_ids[]; > - > static int at91_adc_probe_dt_ts(struct device_node *node, > struct at91_adc_state *st, struct device *dev) > { > @@ -1011,8 +1009,7 @@ static int at91_adc_probe(struct platform_device *pdev) > > st = iio_priv(idev); > > - st->caps = (struct at91_adc_caps *) > - of_match_device(at91_adc_dt_ids, &pdev->dev)->data; > + st->caps = device_get_match_data(&pdev->dev); > > st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); > _______________________________________________ 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:09 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 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 [this message] 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=20201114170908.234f0141@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.