From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>
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,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH v2 08/11] iio: adc: at91_adc: remove forward declaration
Date: Tue, 17 Nov 2020 15:06:53 +0100 [thread overview]
Message-ID: <20201117140656.1235055-9-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20201117140656.1235055-1-alexandre.belloni@bootlin.com>
Remove the forward declaration of at91_adc_dt_ids by using
of_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>
Reviewed-by: Ludovic Desroches <ludovic.desroches@microchip.com>
---
Changes in v2:
- use of_device_get_match_data instead of device_get_match_data
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 347464844263..4c1b3b67445d 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 = of_device_get_match_data(&pdev->dev);
st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers");
--
2.28.0
next prev parent reply other threads:[~2020-11-17 14:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 14:06 [PATCH v2 00/11] iio: adc: at91_adc: cleanup DT bindings Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 01/11] iio: adc: at91_adc: remove platform data Alexandre Belloni
2020-11-28 14:04 ` Jonathan Cameron
2020-11-28 14:23 ` Alexandre Belloni
2020-11-28 15:26 ` Jonathan Cameron
2020-11-28 22:28 ` Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 02/11] iio: adc: at91_adc: rework resolution selection Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 03/11] dt-bindings:iio:adc:remove atmel,adc-res and atmel,adc-res-names Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 04/11] dt-bindings:iio:adc:atmel,sama9260-adc: conversion to yaml from at91_adc.txt Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 05/11] iio: adc: at91_adc: rework trigger definition Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 06/11] dt-bindings:iio:adc:remove triggers Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 07/11] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe Alexandre Belloni
2020-11-28 15:21 ` Jonathan Cameron
2020-11-17 14:06 ` Alexandre Belloni [this message]
2020-11-17 14:06 ` [PATCH v2 09/11] ARM: dts: at91: sama5d3: use proper ADC compatible Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 10/11] ARM: dts: at91: at91sam9rl: fix ADC triggers Alexandre Belloni
2020-11-17 14:06 ` [PATCH v2 11/11] ARM: dts: at91: remove deprecated ADC properties Alexandre Belloni
2020-11-21 15:56 ` [PATCH v2 00/11] iio: adc: at91_adc: cleanup DT bindings Jonathan Cameron
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=20201117140656.1235055-9-alexandre.belloni@bootlin.com \
--to=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@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).