From: Jonathan Cameron <jic23@kernel.org>
To: Peter Meerwald <pmeerw@pmeerw.net>, linux-iio@vger.kernel.org
Subject: Re: [PATCH v3 10/12] iio:adc:ad799x: Set conversion channels and rename ad7997_8_update_scan_mode()
Date: Sun, 13 Jul 2014 21:58:40 +0100 [thread overview]
Message-ID: <53C2F300.4030903@kernel.org> (raw)
In-Reply-To: <1402548856-3564-11-git-send-email-pmeerw@pmeerw.net>
On 12/06/14 05:54, Peter Meerwald wrote:
> rename since function is used by all chips with ALERT pin, not just ad7997/8
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Applied.
> ---
> drivers/iio/adc/ad799x.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
> index 84ce9b4..abc36c8 100644
> --- a/drivers/iio/adc/ad799x.c
> +++ b/drivers/iio/adc/ad799x.c
> @@ -208,7 +208,7 @@ out:
> return IRQ_HANDLED;
> }
>
> -static int ad7997_8_update_scan_mode(struct iio_dev *indio_dev,
> +static int ad799x_update_scan_mode(struct iio_dev *indio_dev,
> const unsigned long *scan_mask)
> {
> struct ad799x_state *st = iio_priv(indio_dev);
> @@ -221,10 +221,14 @@ static int ad7997_8_update_scan_mode(struct iio_dev *indio_dev,
> st->transfer_size = bitmap_weight(scan_mask, indio_dev->masklength) * 2;
>
> switch (st->id) {
> + case ad7992:
> + case ad7993:
> + case ad7994:
> case ad7997:
> case ad7998:
> - return i2c_smbus_write_word_swapped(st->client, AD7998_CONF_REG,
> - st->config | (*scan_mask << AD799X_CHANNEL_SHIFT));
> + st->config &= ~(GENMASK(7, 0) << AD799X_CHANNEL_SHIFT);
> + st->config |= (*scan_mask << AD799X_CHANNEL_SHIFT);
> + return ad799x_write_config(st, st->config);
> default:
> return 0;
> }
> @@ -483,7 +487,7 @@ static const struct iio_info ad7991_info = {
> static const struct iio_info ad7993_4_7_8_noirq_info = {
> .read_raw = &ad799x_read_raw,
> .driver_module = THIS_MODULE,
> - .update_scan_mode = ad7997_8_update_scan_mode,
> + .update_scan_mode = ad799x_update_scan_mode,
> };
>
> static const struct iio_info ad7993_4_7_8_irq_info = {
> @@ -493,7 +497,7 @@ static const struct iio_info ad7993_4_7_8_irq_info = {
> .read_event_value = &ad799x_read_event_value,
> .write_event_value = &ad799x_write_event_value,
> .driver_module = THIS_MODULE,
> - .update_scan_mode = ad7997_8_update_scan_mode,
> + .update_scan_mode = ad799x_update_scan_mode,
> };
>
> static const struct iio_event_spec ad799x_events[] = {
>
next prev parent reply other threads:[~2014-07-13 20:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 4:54 [PATCH v3 00/12] ad799x cleanup Peter Meerwald
2014-06-12 4:54 ` [PATCH v3 01/12] iio:adc:ad799x: Fix reading and writing of event values, apply shift Peter Meerwald
2014-06-12 8:07 ` Lars-Peter Clausen
2014-06-14 14:19 ` Jonathan Cameron
2014-06-29 14:47 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 02/12] iio:adc:ad799x: Fix ad799x_chip_info kerneldoc Peter Meerwald
2014-06-14 14:21 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 03/12] iio:adc:ad799x: Drop I2C access helper functions Peter Meerwald
2014-06-12 8:10 ` Lars-Peter Clausen
2014-06-14 14:26 ` Jonathan Cameron
2014-07-13 20:47 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 04/12] iio:adc:ad799x: Save some lines in ad7997_8_update_scan_mode() exit handling Peter Meerwald
2014-07-13 20:56 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 05/12] iio:adc:ad799x: Use BIT() and GENMASK() Peter Meerwald
2014-07-13 20:56 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 06/12] iio:adc:ad799x: Only expose event interface when IRQ is available Peter Meerwald
2014-07-13 20:56 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 07/12] iio:adc:ad799x: Make chan_spec const in ad799x_chip_config struct Peter Meerwald
2014-07-13 20:57 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 08/12] iio:adc:ad799x: Add helper function to read/write config register Peter Meerwald
2014-07-13 20:57 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 09/12] iio:adc:ad799x: Write default config on probe and reset alert status on probe Peter Meerwald
2014-07-13 20:58 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 10/12] iio:adc:ad799x: Set conversion channels and rename ad7997_8_update_scan_mode() Peter Meerwald
2014-07-13 20:58 ` Jonathan Cameron [this message]
2014-06-12 4:54 ` [PATCH v3 11/12] iio:adc:ad799x: Return more meaningful event enabled state Peter Meerwald
2014-06-12 8:08 ` Lars-Peter Clausen
2014-07-13 20:59 ` Jonathan Cameron
2014-06-12 4:54 ` [PATCH v3 12/12] iio:adc:ad799x: Allow to write event config Peter Meerwald
2014-06-12 8:08 ` Lars-Peter Clausen
2014-07-13 21:01 ` 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=53C2F300.4030903@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.