From: Lars-Peter Clausen <lars@metafoo.de>
To: Peter Meerwald <pmeerw@pmeerw.net>
Cc: linux-iio@vger.kernel.org, knaack.h@gmx.de
Subject: Re: [PATCH 13/15] iio:adc:ad799x: Rename ad7997_8_update_scan_mode() to ad799x_update_scan_mode()
Date: Wed, 04 Jun 2014 10:06:21 +0200 [thread overview]
Message-ID: <538ED37D.3060708@metafoo.de> (raw)
In-Reply-To: <1401835335-29969-14-git-send-email-pmeerw@pmeerw.net>
On 06/04/2014 12:42 AM, Peter Meerwald wrote:
> function is used by all chips with ALERT pin
The subject is a bit misleading, this does a bit more than just renaming the
function.
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> ---
> 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 f8e029d..5c9445e 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-06-04 8:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 22:42 [PATCH 00/15] ad799x cleanup Peter Meerwald
2014-06-03 22:42 ` [PATCH 01/15] staging:iio: Update iio_event_monitor program Peter Meerwald
2014-06-03 22:42 ` [PATCH 02/15] staging:iio: Fix iio_utils.h function prototypes Peter Meerwald
2014-06-03 22:42 ` [PATCH 03/15] iio:adc:ad799x: Fix ad799x_chip_info kerneldoc Peter Meerwald
2014-06-04 7:44 ` Lars-Peter Clausen
2014-06-03 22:42 ` [PATCH 04/15] iio:adc:ad799x: Drop I2C access helper functions Peter Meerwald
2014-06-03 22:42 ` [PATCH 05/15] iio:adc:ad799x: Save some lines in ad7997_8_update_scan_mode() exit handling Peter Meerwald
2014-06-04 7:56 ` Lars-Peter Clausen
2014-06-03 22:42 ` [PATCH 06/15] iio:adc:ad799x: Use BIT() and GENMASK() Peter Meerwald
2014-06-03 22:42 ` [PATCH 07/15] iio:adc:ad799x: Only expose event interface when IRQ is available Peter Meerwald
2014-06-04 8:01 ` Lars-Peter Clausen
2014-06-03 22:42 ` [PATCH 08/15] iio:adc:ad799x: Make chan_spec const in ad799x_chip_config struct Peter Meerwald
2014-06-04 7:57 ` Lars-Peter Clausen
2014-06-03 22:42 ` [PATCH 09/15] iio:adc:ad799x: Fix reported event values, apply shift Peter Meerwald
2014-06-03 22:42 ` [PATCH 10/15] iio:adc:ad799x: Check event value range on write Peter Meerwald
2014-06-04 7:46 ` Lars-Peter Clausen
2014-06-03 22:42 ` [PATCH 11/15] iio:adc:ad799x: Add helper function to read/write config register Peter Meerwald
2014-06-04 8:05 ` Lars-Peter Clausen
2014-06-04 8:42 ` Peter Meerwald
2014-06-03 22:42 ` [PATCH 12/15] iio:adc:ad799x: Write default config on probe and reset alert status on probe Peter Meerwald
2014-06-04 8:05 ` Lars-Peter Clausen
2014-06-03 22:42 ` [PATCH 13/15] iio:adc:ad799x: Rename ad7997_8_update_scan_mode() to ad799x_update_scan_mode() Peter Meerwald
2014-06-04 8:06 ` Lars-Peter Clausen [this message]
2014-06-03 22:42 ` [PATCH 14/15] iio:adc:ad799x: Return more meaningful event enabled state Peter Meerwald
2014-06-03 22:42 ` [PATCH 15/15] iio:adc:ad799x: Allow to write event config Peter Meerwald
2014-06-04 7:55 ` Lars-Peter Clausen
2014-06-04 8:35 ` Peter Meerwald
2014-06-05 9:14 ` Lars-Peter Clausen
2014-06-05 20:15 ` [PATCH 00/15] ad799x cleanup Jonathan Cameron
2014-06-07 15:53 ` Peter Meerwald
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=538ED37D.3060708@metafoo.de \
--to=lars@metafoo.de \
--cc=knaack.h@gmx.de \
--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.