From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org, Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Cc: Hennerich@vger.kernel.org, Michael <Michael.Hennerich@analog.com>,
Nuno Sa <Nuno.Sa@analog.com>,
lars@metafoo.de, Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v3 12/20] staging:iio:ad7280a: Reflect optionality of irq in ABI
Date: Sun, 6 Feb 2022 19:03:20 +0000 [thread overview]
Message-ID: <20220206190328.333093-13-jic23@kernel.org> (raw)
In-Reply-To: <20220206190328.333093-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Given the irq is optional, let us remove the interfaces related to
events when it is not present.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
---
drivers/staging/iio/adc/ad7280a.c | 48 +++++++++++++++++++------------
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index d408974c848c..8635a12f5f84 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -579,23 +579,29 @@ static const struct iio_event_spec ad7280_events[] = {
},
};
-static void ad7280_voltage_channel_init(struct iio_chan_spec *chan, int i)
+static void ad7280_voltage_channel_init(struct iio_chan_spec *chan, int i,
+ bool irq_present)
{
chan->type = IIO_VOLTAGE;
chan->differential = 1;
chan->channel = i;
chan->channel2 = chan->channel + 1;
- chan->event_spec = ad7280_events;
- chan->num_event_specs = ARRAY_SIZE(ad7280_events);
+ if (irq_present) {
+ chan->event_spec = ad7280_events;
+ chan->num_event_specs = ARRAY_SIZE(ad7280_events);
+ }
chan->ext_info = ad7280_cell_ext_info;
}
-static void ad7280_temp_channel_init(struct iio_chan_spec *chan, int i)
+static void ad7280_temp_channel_init(struct iio_chan_spec *chan, int i,
+ bool irq_present)
{
chan->type = IIO_TEMP;
chan->channel = i;
- chan->event_spec = ad7280_events;
- chan->num_event_specs = ARRAY_SIZE(ad7280_events);
+ if (irq_present) {
+ chan->event_spec = ad7280_events;
+ chan->num_event_specs = ARRAY_SIZE(ad7280_events);
+ }
}
static void ad7280_common_fields_init(struct iio_chan_spec *chan, int addr,
@@ -629,7 +635,8 @@ static void ad7280_total_voltage_channel_init(struct iio_chan_spec *chan,
chan->scan_type.storagebits = 32;
}
-static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt)
+static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt,
+ bool irq_present)
{
int addr, ch, i;
struct iio_chan_spec *chan;
@@ -639,10 +646,10 @@ static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt)
if (ch < AD7280A_AUX_ADC_1_REG) {
i = AD7280A_CALC_VOLTAGE_CHAN_NUM(dev, ch);
- ad7280_voltage_channel_init(chan, i);
+ ad7280_voltage_channel_init(chan, i, irq_present);
} else {
i = AD7280A_CALC_TEMP_CHAN_NUM(dev, ch);
- ad7280_temp_channel_init(chan, i);
+ ad7280_temp_channel_init(chan, i, irq_present);
}
addr = ad7280a_devaddr(dev) << 8 | ch;
@@ -652,7 +659,7 @@ static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt)
}
}
-static int ad7280_channel_init(struct ad7280_state *st)
+static int ad7280_channel_init(struct ad7280_state *st, bool irq_present)
{
int dev, cnt = 0;
@@ -662,7 +669,7 @@ static int ad7280_channel_init(struct ad7280_state *st)
return -ENOMEM;
for (dev = 0; dev <= st->slave_num; dev++)
- ad7280_init_dev_channels(st, dev, &cnt);
+ ad7280_init_dev_channels(st, dev, &cnt, irq_present);
ad7280_total_voltage_channel_init(&st->channels[cnt], cnt, dev);
@@ -935,6 +942,11 @@ static const struct iio_info ad7280_info = {
.write_event_value = &ad7280a_write_thresh,
};
+static const struct iio_info ad7280_info_no_irq = {
+ .read_raw = ad7280_read_raw,
+ .write_raw = ad7280_write_raw,
+};
+
static const struct ad7280_platform_data ad7793_default_pdata = {
.acquisition_time = AD7280A_ACQ_TIME_400ns,
.thermistor_term_en = true,
@@ -988,18 +1000,12 @@ static int ad7280_probe(struct spi_device *spi)
indio_dev->name = spi_get_device_id(spi)->name;
indio_dev->modes = INDIO_DIRECT_MODE;
- ret = ad7280_channel_init(st);
+ ret = ad7280_channel_init(st, spi->irq > 0);
if (ret < 0)
return ret;
indio_dev->num_channels = ret;
indio_dev->channels = st->channels;
- indio_dev->info = &ad7280_info;
-
- ret = devm_iio_device_register(&spi->dev, indio_dev);
- if (ret)
- return ret;
-
if (spi->irq > 0) {
ret = ad7280_write(st, AD7280A_DEVADDR_MASTER,
AD7280A_ALERT_REG, 1,
@@ -1023,9 +1029,13 @@ static int ad7280_probe(struct spi_device *spi)
indio_dev);
if (ret)
return ret;
+
+ indio_dev->info = &ad7280_info;
+ } else {
+ indio_dev->info = &ad7280_info_no_irq;
}
- return 0;
+ return devm_iio_device_register(&spi->dev, indio_dev);
}
static const struct spi_device_id ad7280_id[] = {
--
2.35.1
next prev parent reply other threads:[~2022-02-06 18:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-06 19:03 [PATCH v3 00/20] iio:adc:ad7280a Cleanup and proposed staging graduation Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 01/20] staging:iio:adc:ad7280a: Fix handing of device address bit reversing Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 02/20] staging:iio:adc:ad7280a: Register define cleanup Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 03/20] staging:iio:adc:ad7280a: rename _read() to _read_reg() Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 04/20] staging:iio:adc:ad7280a: Split buff[2] into tx and rx parts Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 05/20] staging:iio:adc:ad7280a: Use bitfield ops to managed fields in transfers Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 06/20] staging:iio:adc:ad7280a: Switch to standard event control Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 07/20] staging:iio:adc:ad7280a: Standardize extended ABI naming Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 08/20] staging:iio:adc:ad7280a: Drop unused timestamp channel Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 09/20] staging:iio:adc:ad7280a: Trivial comment formatting cleanup Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 10/20] staging:iio:adc:ad7280a: Make oversampling_ratio a runtime control Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 11/20] staging:iio:adc:ad7280a: Cleanup includes Jonathan Cameron
2022-02-06 19:03 ` Jonathan Cameron [this message]
2022-02-06 19:03 ` [PATCH v3 13/20] staging:iio:adc:ad7280a: Use a local dev pointer to avoid &spi->dev Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 14/20] staging:iio:adc:ad7280a: Use device properties to replace platform data Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 15/20] staging:iio:adc:ad7280a: Drop buggy support for early termination of AUX alert Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 16/20] dt-bindings:iio:adc:ad7280a: Add binding Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 17/20] iio:adc:ad7280a: Document ABI for cell balance switches Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 18/20] staging:iio:adc:ad7280a: Remove shift from cb_mask state cache Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 19/20] staging:iio:adc:ad7280a: Use more conservative delays to allow 105C operation Jonathan Cameron
2022-02-06 19:03 ` [PATCH v3 20/20] iio:adc:ad7280a: Move out of staging Jonathan Cameron
2022-02-13 20:11 ` [PATCH v3 00/20] iio:adc:ad7280a Cleanup and proposed staging graduation Marcelo Schmitt
2022-02-18 11:59 ` 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=20220206190328.333093-13-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Hennerich@vger.kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=Michael.Hennerich@analog.com \
--cc=Nuno.Sa@analog.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=marcelo.schmitt1@gmail.com \
/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