From: Jonathan Cameron <jic23@kernel.org>
To: Stefan Popa <stefan.popa@analog.com>
Cc: <robh+dt@kernel.org>, <mark.rutland@arm.com>,
<Michael.Hennerich@analog.com>, <knaack.h@gmx.de>,
<lars@metafoo.de>, <pmeerw@pmeerw.net>,
<gregkh@linuxfoundation.org>, <linux-kernel@vger.kernel.org>,
<linux-iio@vger.kernel.org>, <devel@driverdev.osuosl.org>,
<stefan.popa@analog.co>
Subject: Re: [PATCH 06/11] staging: iio: adc: ad7606: Use find_closest() macro
Date: Sun, 16 Dec 2018 13:51:36 +0000 [thread overview]
Message-ID: <20181216135136.7c7bde18@archlinux> (raw)
In-Reply-To: <1544705183-13288-7-git-send-email-stefan.popa@analog.com>
On Thu, 13 Dec 2018 14:46:18 +0200
Stefan Popa <stefan.popa@analog.com> wrote:
> When looking for the available scale or oversampling ratio, it is better
> to use the find_closest() macro. This simplifies the code and also does
> not require an exact value to be entered from the user space.
>
> Signed-off-by: Stefan Popa <stefan.popa@analog.com>
Nice little cleanup.
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/staging/iio/adc/ad7606.c | 58 +++++++++++++++-------------------------
> 1 file changed, 22 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c
> index 13aeeec..0925379 100644
> --- a/drivers/staging/iio/adc/ad7606.c
> +++ b/drivers/staging/iio/adc/ad7606.c
> @@ -16,6 +16,7 @@
> #include <linux/delay.h>
> #include <linux/sched.h>
> #include <linux/module.h>
> +#include <linux/util_macros.h>
>
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> @@ -30,8 +31,12 @@
> * Scales are computed as 5000/32768 and 10000/32768 respectively,
> * so that when applied to the raw values they provide mV values
> */
> -static const unsigned int scale_avail[2][2] = {
> - {0, 152588}, {0, 305176}
> +static const unsigned int scale_avail[2] = {
> + 152588, 305176
> +};
> +
> +static const unsigned int ad7606_oversampling_avail[7] = {
> + 1, 2, 4, 8, 16, 32, 64,
> };
>
> static int ad7606_reset(struct ad7606_state *st)
> @@ -148,8 +153,8 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
> *val = (short)ret;
> return IIO_VAL_INT;
> case IIO_CHAN_INFO_SCALE:
> - *val = scale_avail[st->range][0];
> - *val2 = scale_avail[st->range][1];
> + *val = 0;
> + *val2 = scale_avail[st->range];
> return IIO_VAL_INT_PLUS_MICRO;
> case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
> *val = st->oversampling;
> @@ -165,8 +170,8 @@ static ssize_t in_voltage_scale_available_show(struct device *dev,
> int i, len = 0;
>
> for (i = 0; i < ARRAY_SIZE(scale_avail); i++)
> - len += scnprintf(buf + len, PAGE_SIZE - len, "%d.%06u ",
> - scale_avail[i][0], scale_avail[i][1]);
> + len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
> + scale_avail[i]);
>
> buf[len - 1] = '\n';
>
> @@ -175,18 +180,6 @@ static ssize_t in_voltage_scale_available_show(struct device *dev,
>
> static IIO_DEVICE_ATTR_RO(in_voltage_scale_available, 0);
>
> -static int ad7606_oversampling_get_index(unsigned int val)
> -{
> - unsigned char supported[] = {1, 2, 4, 8, 16, 32, 64};
> - int i;
> -
> - for (i = 0; i < ARRAY_SIZE(supported); i++)
> - if (val == supported[i])
> - return i;
> -
> - return -EINVAL;
> -}
> -
> static int ad7606_write_raw(struct iio_dev *indio_dev,
> struct iio_chan_spec const *chan,
> int val,
> @@ -195,36 +188,29 @@ static int ad7606_write_raw(struct iio_dev *indio_dev,
> {
> struct ad7606_state *st = iio_priv(indio_dev);
> DECLARE_BITMAP(values, 3);
> - int ret, i;
> + int i;
>
> switch (mask) {
> case IIO_CHAN_INFO_SCALE:
> - ret = -EINVAL;
> mutex_lock(&st->lock);
> - for (i = 0; i < ARRAY_SIZE(scale_avail); i++)
> - if (val2 == scale_avail[i][1]) {
> - gpiod_set_value(st->gpio_range, i);
> - st->range = i;
> -
> - ret = 0;
> - break;
> - }
> + i = find_closest(val2, scale_avail, ARRAY_SIZE(scale_avail));
> + gpiod_set_value(st->gpio_range, i);
> + st->range = i;
> mutex_unlock(&st->lock);
>
> - return ret;
> + return 0;
> case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
> if (val2)
> return -EINVAL;
> - ret = ad7606_oversampling_get_index(val);
> - if (ret < 0)
> - return ret;
> + i = find_closest(val, ad7606_oversampling_avail,
> + ARRAY_SIZE(ad7606_oversampling_avail));
>
> - values[0] = ret;
> + values[0] = i;
>
> mutex_lock(&st->lock);
> - gpiod_set_array_value(3, st->gpio_os->desc, st->gpio_os->info,
> - values);
> - st->oversampling = val;
> + gpiod_set_array_value(ARRAY_SIZE(values), st->gpio_os->desc,
> + st->gpio_os->info, values);
> + st->oversampling = ad7606_oversampling_avail[i];
> mutex_unlock(&st->lock);
>
> return 0;
next prev parent reply other threads:[~2018-12-16 13:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 12:46 [PATCH 00/11] staging: iio: ad7606: Move out of staging Stefan Popa
2018-12-13 12:46 ` [PATCH 01/11] staging: iio: adc: ad7606: Simplify the Kconfing menu Stefan Popa
2018-12-13 15:37 ` Rob Herring
2018-12-13 12:46 ` [PATCH 02/11] staging: iio: adc: ad7606: Use SPDX identifier Stefan Popa
2018-12-13 13:21 ` Dan Carpenter
2018-12-13 12:46 ` [PATCH 03/11] staging: iio: adc: ad7606: Use wait-for-completion handler Stefan Popa
2018-12-16 13:41 ` Jonathan Cameron
2018-12-13 12:46 ` [PATCH 04/11] staging: iio: adc: ad7606: Use devm functions in probe Stefan Popa
2018-12-16 13:43 ` Jonathan Cameron
2018-12-13 12:46 ` [PATCH 05/11] staging: iio: adc: ad7606: Add support for threaded irq Stefan Popa
2018-12-13 13:28 ` Dan Carpenter
2018-12-16 13:49 ` Jonathan Cameron
2018-12-17 10:28 ` Popa, Stefan Serban
2018-12-13 12:46 ` [PATCH 06/11] staging: iio: adc: ad7606: Use find_closest() macro Stefan Popa
2018-12-16 13:51 ` Jonathan Cameron [this message]
2018-12-13 12:46 ` [PATCH 07/11] staging: iio: adc: ad7606: Use vendor prefix for DT properties Stefan Popa
2018-12-16 13:53 ` Jonathan Cameron
2018-12-13 12:46 ` [PATCH 08/11] staging: iio: adc: ad7606: Add OF device ID table Stefan Popa
2018-12-16 13:54 ` Jonathan Cameron
2018-12-13 12:46 ` [PATCH 09/11] staging: iio: adc: ad7606: Misc style fixes (no functional change) Stefan Popa
2018-12-16 13:56 ` Jonathan Cameron
2018-12-13 12:46 ` [PATCH 10/11] staging: iio: adc: ad7606: Move out of staging Stefan Popa
2018-12-16 14:14 ` Jonathan Cameron
2018-12-20 19:45 ` kbuild test robot
2018-12-13 12:46 ` [PATCH 11/11] dt-bindings: iio: adc: Add docs for AD7606 ADC Stefan Popa
2018-12-16 13:58 ` 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=20181216135136.7c7bde18@archlinux \
--to=jic23@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=stefan.popa@analog.co \
--cc=stefan.popa@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).