From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/14] iio: pressure-core: st: Allow for number of channels to vary
Date: Mon, 9 Sep 2013 11:10:03 +0100 [thread overview]
Message-ID: <1378721410-30937-8-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1378721410-30937-1-git-send-email-lee.jones@linaro.org>
At the moment the number of channels specified is dictated by the first
sensor supported by the driver. As we add support for more sensors this
is likely to vary. Instead of using the ARRAY_SIZE() of the LPS331AP's
channel specifier we'll use a new adaptable 'struct st_sensors' element
instead.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/iio/pressure/st_pressure_core.c | 3 ++-
include/linux/iio/common/st_sensors.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 506b02d..93bff9b 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -107,6 +107,7 @@ static const struct st_sensors st_press_sensors[] = {
[0] = LPS331AP_PRESS_DEV_NAME,
},
.ch = (struct iio_chan_spec *)st_press_lps331ap_channels,
+ .num_ch = ARRAY_SIZE(st_press_lps331ap_channels),
.odr = {
.addr = ST_PRESS_LPS331AP_ODR_ADDR,
.mask = ST_PRESS_LPS331AP_ODR_MASK,
@@ -245,7 +246,7 @@ int st_press_common_probe(struct iio_dev *indio_dev,
pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
pdata->multiread_bit = pdata->sensor->multi_read_bit;
indio_dev->channels = pdata->sensor->ch;
- indio_dev->num_channels = ARRAY_SIZE(st_press_lps331ap_channels);
+ indio_dev->num_channels = pdata->sensor->num_ch;
if (pdata->sensor->fs.addr != 0)
pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index e51f654..e732fda 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -184,6 +184,7 @@ struct st_sensors {
u8 wai;
char sensors_supported[ST_SENSORS_MAX_4WAI][ST_SENSORS_MAX_NAME];
struct iio_chan_spec *ch;
+ int num_ch;
struct st_sensor_odr odr;
struct st_sensor_power pw;
struct st_sensor_axis enable_axis;
--
1.8.1.2
next prev parent reply other threads:[~2013-09-09 10:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 10:09 [PATCH v2 00/14] iio: ST clean-ups and new pressure sensor device Lee Jones
2013-09-09 10:09 ` [PATCH 01/14] ARM: ux500: Remove PrimeCell IDs from Nomadik I2C DT nodes Lee Jones
2013-09-09 10:09 ` [PATCH 02/14] ARM: ux500: Enable the LPS001WP Pressure & Temperature sensor from DT Lee Jones
2013-09-09 10:09 ` [PATCH 03/14] ARM: ux500: CONFIG: Enable ST's IIO Pressure Sensors by default Lee Jones
2013-09-09 10:10 ` [PATCH 04/14] iio: pressure-core: st: Describe LPS331AP defines by name Lee Jones
2013-09-09 10:10 ` [PATCH 05/14] iio: pressure-core: st: Expand and rename LPS331AP's channel descriptor Lee Jones
2013-09-09 10:10 ` [PATCH 06/14] iio: sensors-core: st: Allow full-scale to be an optional feature Lee Jones
2013-09-09 10:10 ` Lee Jones [this message]
2013-09-09 10:10 ` [PATCH 08/14] iio: pressure-core: st: Clean-up probe() function Lee Jones
2013-09-09 10:10 ` [PATCH 09/14] iio: pressure: st: Add support for new LPS001WP pressure sensor Lee Jones
2013-09-09 10:10 ` [PATCH 10/14] iio: pressure-core: st: Provide support for the Vdd power supply Lee Jones
2013-09-09 10:10 ` [PATCH 11/14] iio: pressure-core: st: Provide support for the Vdd_IO " Lee Jones
2013-09-09 10:10 ` [PATCH 12/14] Documentation: dt: i2c: Add LPS001WP to the Trivial Devices list Lee Jones
2013-09-09 11:42 ` [PATCH v2 12/14] Documentation: dt: iio: Add binding for LPS001WP Lee Jones
2013-09-09 10:10 ` [PATCH 13/14] iio: sensors-core: st: Clean-up error handling in st_sensors_init_sensor() Lee Jones
2013-09-09 10:10 ` [PATCH 14/14] iio: sensors-core: st: Support sensors which don't have a Data Ready pin Lee Jones
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=1378721410-30937-8-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).