From: Jonathan Cameron <jic23@cam.ac.uk>
To: michael.hennerich@analog.com
Cc: linux-iio@vger.kernel.org,
device-drivers-devel@blackfin.uclinux.org, drivers@analog.com
Subject: Re: [PATCH 07/12] iio: ad7291: introduce IIO_EVENT_CODE_EXTRACT_CHAN_TYPE and use accordingly
Date: Wed, 31 Aug 2011 12:33:01 +0100 [thread overview]
Message-ID: <4E5E1BED.60608@cam.ac.uk> (raw)
In-Reply-To: <1314788260-5791-7-git-send-email-michael.hennerich@analog.com>
On 08/31/11 11:57, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> Fix channel type handling
Gah. Yet another stupid error. Good spot. Certainly implies my naming
of those macros may leave something to be desired if even I assume they
mean something different from what they actually do...
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
merged.
> ---
> drivers/staging/iio/adc/ad7291.c | 6 +++---
> drivers/staging/iio/sysfs.h | 1 +
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
> index 7dfdc27..b365a74 100644
> --- a/drivers/staging/iio/adc/ad7291.c
> +++ b/drivers/staging/iio/adc/ad7291.c
> @@ -313,7 +313,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev,
> u16 uval;
> s16 signval;
>
> - switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
> + switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
> case IIO_VOLTAGE:
> reg = ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)]
> [!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
> @@ -349,7 +349,7 @@ static int ad7291_write_event_value(struct iio_dev *indio_dev,
> u8 reg;
> s16 signval;
>
> - switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
> + switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
> case IIO_VOLTAGE:
> if (val > 0xFFF || val < 0)
> return -EINVAL;
> @@ -377,7 +377,7 @@ static int ad7291_read_event_config(struct iio_dev *indio_dev,
> /* To be enabled the channel must simply be on. If any are enabled
> we are in continuous sampling mode */
>
> - switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
> + switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
> case IIO_VOLTAGE:
> if (chip->c_mask &
> (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code)))
> diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
> index aad1f4b..d98d12d 100644
> --- a/drivers/staging/iio/sysfs.h
> +++ b/drivers/staging/iio/sysfs.h
> @@ -147,6 +147,7 @@ enum iio_event_direction {
>
> #define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
> #define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xFF)
> +#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
>
> /* Event code number extraction depends on which type of event we have.
> * Perhaps review this function in the future*/
next prev parent reply other threads:[~2011-08-31 11:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-31 10:57 [PATCH 01/12] iio: ad7291: fix channel mapping michael.hennerich
2011-08-31 10:57 ` [PATCH 02/12] iio: ad7291: Fix typos, change kconfig description and file header michael.hennerich
2011-08-31 11:18 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 03/12] iio: ad7291: Fix AD7291_T_SENSE_MASK michael.hennerich
2011-08-31 11:19 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 04/12] iio: ad7291: Add regulator, reference voltage and scale handling michael.hennerich
2011-08-31 11:22 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 05/12] iio: ad7291: don't swab results twice and introduce more register defines michael.hennerich
2011-08-31 11:28 ` Jonathan Cameron
2011-08-31 11:49 ` Hennerich, Michael
2011-08-31 12:01 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 06/12] iio: ad7291: fix mask bit generation michael.hennerich
2011-08-31 11:29 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 07/12] iio: ad7291: introduce IIO_EVENT_CODE_EXTRACT_CHAN_TYPE and use accordingly michael.hennerich
2011-08-31 11:33 ` Jonathan Cameron [this message]
2011-08-31 10:57 ` [PATCH 08/12] iio: ad7291: fix channel mapping for event enables michael.hennerich
2011-08-31 11:34 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 09/12] iio: core: fix IIO_EVENT_CODE_EXTRACT_DIR definition michael.hennerich
2011-08-31 11:15 ` Jonathan Cameron
2011-08-31 12:01 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 10/12] iio: ad7192: return len and fix out of range checking michael.hennerich
2011-08-31 11:37 ` Jonathan Cameron
2011-08-31 11:47 ` Hennerich, Michael
2011-08-31 11:59 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 11/12] iio: ad7291: reset device and setup irq before it is enabled michael.hennerich
2011-08-31 11:39 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 12/12] iio: ad7192: add temp_scale attribute, change module description michael.hennerich
2011-08-31 11:52 ` Jonathan Cameron
2011-08-31 11:14 ` [PATCH 01/12] iio: ad7291: fix channel mapping 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=4E5E1BED.60608@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=drivers@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=michael.hennerich@analog.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;
as well as URLs for NNTP newsgroup(s).