From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:51886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752612AbdHTLFX (ORCPT ); Sun, 20 Aug 2017 07:05:23 -0400 Date: Sun, 20 Aug 2017 11:59:22 +0100 From: Jonathan Cameron To: Akinobu Mita Cc: linux-iio@vger.kernel.org, Daniel Baluta Subject: Re: [PATCH v2 08/11] iio: adc: ti-ads1015: add helper to set conversion mode Message-ID: <20170820115922.5c315c88@archlinux> In-Reply-To: <1500564267-8613-9-git-send-email-akinobu.mita@gmail.com> References: <1500564267-8613-1-git-send-email-akinobu.mita@gmail.com> <1500564267-8613-9-git-send-email-akinobu.mita@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On Fri, 21 Jul 2017 00:24:24 +0900 Akinobu Mita wrote: > This adds a helper function to set conversion mode as there are a fair > number of users. > > Cc: Daniel Baluta > Cc: Jonathan Cameron > Signed-off-by: Akinobu Mita Applied. Thanks, Jonathan > --- > drivers/iio/adc/ti-ads1015.c | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c > index e83cebc..9f3f0c9 100644 > --- a/drivers/iio/adc/ti-ads1015.c > +++ b/drivers/iio/adc/ti-ads1015.c > @@ -570,6 +570,13 @@ static void ads1015_get_channels_config(struct i2c_client *client) > } > } > > +static int ads1015_set_conv_mode(struct ads1015_data *data, int mode) > +{ > + return regmap_update_bits(data->regmap, ADS1015_CFG_REG, > + ADS1015_CFG_MOD_MASK, > + mode << ADS1015_CFG_MOD_SHIFT); > +} > + > static int ads1015_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > @@ -628,9 +635,7 @@ static int ads1015_probe(struct i2c_client *client, > return ret; > } > > - ret = regmap_update_bits(data->regmap, ADS1015_CFG_REG, > - ADS1015_CFG_MOD_MASK, > - ADS1015_CONTINUOUS << ADS1015_CFG_MOD_SHIFT); > + ret = ads1015_set_conv_mode(data, ADS1015_CONTINUOUS); > if (ret) > return ret; > > @@ -671,9 +676,7 @@ static int ads1015_remove(struct i2c_client *client) > iio_triggered_buffer_cleanup(indio_dev); > > /* power down single shot mode */ > - return regmap_update_bits(data->regmap, ADS1015_CFG_REG, > - ADS1015_CFG_MOD_MASK, > - ADS1015_SINGLESHOT << ADS1015_CFG_MOD_SHIFT); > + return ads1015_set_conv_mode(data, ADS1015_SINGLESHOT); > } > > #ifdef CONFIG_PM > @@ -682,9 +685,7 @@ static int ads1015_runtime_suspend(struct device *dev) > struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); > struct ads1015_data *data = iio_priv(indio_dev); > > - return regmap_update_bits(data->regmap, ADS1015_CFG_REG, > - ADS1015_CFG_MOD_MASK, > - ADS1015_SINGLESHOT << ADS1015_CFG_MOD_SHIFT); > + return ads1015_set_conv_mode(data, ADS1015_SINGLESHOT); > } > > static int ads1015_runtime_resume(struct device *dev) > @@ -693,9 +694,7 @@ static int ads1015_runtime_resume(struct device *dev) > struct ads1015_data *data = iio_priv(indio_dev); > int ret; > > - ret = regmap_update_bits(data->regmap, ADS1015_CFG_REG, > - ADS1015_CFG_MOD_MASK, > - ADS1015_CONTINUOUS << ADS1015_CFG_MOD_SHIFT); > + ret = ads1015_set_conv_mode(data, ADS1015_CONTINUOUS); > if (!ret) > data->conv_invalid = true; >