| Message ID | 20201113212650.507680-7-alexandre.belloni@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: adc: at91_adc: cleanup DT bindings | expand |
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"); >
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");
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> --- drivers/iio/adc/at91_adc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)