From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.19.201]:35360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872AbaGMU40 (ORCPT ); Sun, 13 Jul 2014 16:56:26 -0400 Message-ID: <53C2F300.4030903@kernel.org> Date: Sun, 13 Jul 2014 21:58:40 +0100 From: Jonathan Cameron MIME-Version: 1.0 To: Peter Meerwald , linux-iio@vger.kernel.org Subject: Re: [PATCH v3 10/12] iio:adc:ad799x: Set conversion channels and rename ad7997_8_update_scan_mode() References: <1402548856-3564-1-git-send-email-pmeerw@pmeerw.net> <1402548856-3564-11-git-send-email-pmeerw@pmeerw.net> In-Reply-To: <1402548856-3564-11-git-send-email-pmeerw@pmeerw.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org 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 > Acked-by: Lars-Peter Clausen 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[] = { >