From: Denis CIOCCA <denis.ciocca@st.com>
To: Lee Jones <lee.jones@linaro.org>
Cc: "linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"jic23@cam.ac.uk" <jic23@cam.ac.uk>,
"arnd@arndb.de" <arnd@arndb.de>,
"linus.walleij@linaro.org" <linus.walleij@linaro.org>,
"linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Subject: Re: [PATCH 08/11] iio: pressure-core: st: Allow for number of channels to vary
Date: Wed, 4 Sep 2013 22:17:50 +0200 [thread overview]
Message-ID: <5227956E.2050607@st.com> (raw)
In-Reply-To: <1378287103-21765-9-git-send-email-lee.jones@linaro.org>
Acked-by: Denis Ciocca <denis.ciocca@st.com>
> 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/pressu=
re/st_pressure_core.c
> index 423ed6a..3cf54ed 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -101,6 +101,7 @@ static const struct st_sensors st_press_sensors[] =3D=
{
> [0] =3D LPS331AP_PRESS_DEV_NAME,
> },
> .ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels,
> + .num_ch =3D ARRAY_SIZE(st_press_lsp331ap_channels),
> .odr =3D {
> .addr =3D ST_PRESS_LPS331AP_ODR_ADDR,
> .mask =3D ST_PRESS_LPS331AP_ODR_MASK,
> @@ -237,7 +238,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)
> pdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS;
> pdata->multiread_bit =3D pdata->sensor->multi_read_bit;
> indio_dev->channels =3D pdata->sensor->ch;
> - indio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels);
> + indio_dev->num_channels =3D pdata->sensor->num_ch;
> =20
> if (pdata->sensor->fs.addr !=3D 0)
> pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)
> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/co=
mmon/st_sensors.h
> index 72b2694..4aef925 100644
> --- a/include/linux/iio/common/st_sensors.h
> +++ b/include/linux/iio/common/st_sensors.h
> @@ -180,6 +180,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;
next prev parent reply other threads:[~2013-09-04 20:17 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 9:31 [PATCH 00/11] iio: ST clean-ups and new pressure sensor device Lee Jones
2013-09-04 9:31 ` [PATCH 01/11] ARM: ux500: Remove PrimeCell IDs from Nomadik I2C DT nodes Lee Jones
2013-09-04 9:31 ` [PATCH 02/11] ARM: ux500: Enable the LPS001WP Pressure & Temperature sensor from DT Lee Jones
2013-09-04 12:38 ` Mark Rutland
2013-09-04 13:36 ` Lee Jones
2013-09-04 14:08 ` Mark Rutland
2013-09-04 13:51 ` Lee Jones
2013-09-04 13:55 ` [PATCH v2 " Lee Jones
2013-09-04 9:31 ` [PATCH 03/11] ARM: ux500: CONFIG: Enable ST's IIO Pressure Sensors by default Lee Jones
2013-09-04 9:31 ` [PATCH 04/11] iio: pressure-i2c: st: Simplify error checking in probe() Lee Jones
2013-09-04 16:21 ` Jonathan Cameron
2013-09-04 16:30 ` Lee Jones
2013-09-04 9:31 ` [PATCH 05/11] iio: pressure-core: st: Describe LPS331AP defines by name Lee Jones
2013-09-04 20:10 ` Denis CIOCCA
2013-09-05 7:38 ` Lee Jones
2013-09-04 9:31 ` [PATCH 06/11] iio: pressure-core: st: Expand and rename LPS331AP's channel descriptor Lee Jones
2013-09-04 20:15 ` Denis CIOCCA
2013-09-05 7:21 ` Lee Jones
2013-09-05 7:31 ` Denis CIOCCA
2013-09-05 7:59 ` Lee Jones
2013-09-05 8:35 ` Denis CIOCCA
2013-09-04 9:31 ` [PATCH 07/11] iio: sensors-core: st: Allow full-scale to be an optional feature Lee Jones
2013-09-04 20:17 ` Denis CIOCCA
2013-09-04 9:31 ` [PATCH 08/11] iio: pressure-core: st: Allow for number of channels to vary Lee Jones
2013-09-04 20:17 ` Denis CIOCCA [this message]
2013-09-04 9:31 ` [PATCH 09/11] iio: pressure-core: st: Clean-up error handling in probe function Lee Jones
2013-09-04 16:32 ` Jonathan Cameron
2013-09-04 9:31 ` [PATCH 10/11] iio: pressure: st: Add support for new LPS001WP pressure sensor Lee Jones
2013-09-04 9:31 ` [PATCH 11/11] iio: pressure-core: st: Provide correct regulator support Lee Jones
2013-09-04 13:11 ` Mark Rutland
2013-09-04 13:18 ` Lars-Peter Clausen
2013-09-04 13:26 ` Lee Jones
2013-09-04 15:05 ` Mark Brown
2013-09-04 13:24 ` Mark Brown
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=5227956E.2050607@st.com \
--to=denis.ciocca@st.com \
--cc=arnd@arndb.de \
--cc=jic23@cam.ac.uk \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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).