On Wed, 31 Oct 2018 21:29:53 +0530
Nishad Kamdar <nishadkamdar@xxxxxxxxx> wrote:
> Drop gpioin flag which decides how the GPIOs
> are controlled as the GPIOs must be outputs
> for the host as per the datasheet.
>
> Signed-off-by: Nishad Kamdar <nishadkamdar@xxxxxxxxx>
Whilst this does the right thing, it doesn't take advantage
of opportunities to clean up. I've made a few changes in applying.
See below. Also added a note that this gets rid of the platform data.
Note you need to do git rm drivers/staging/iio/resolver/ad2s1210.h to
actually get rid of the file. + remove it from the includes. I did
that as well whilst here.
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/resolver/ad2s1210.c | 45 ++++---------------------
> drivers/staging/iio/resolver/ad2s1210.h | 17 ----------
> 2 files changed, 6 insertions(+), 56 deletions(-)
>
> diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
> index 82ac9847f6f4..d3e7d5aad2c8 100644
> --- a/drivers/staging/iio/resolver/ad2s1210.c
> +++ b/drivers/staging/iio/resolver/ad2s1210.c
> @@ -80,15 +80,7 @@ struct ad2s1210_gpio {
> unsigned long flags;
> };
>
> -static const struct ad2s1210_gpio gpios_in[] = {
> - [AD2S1210_SAMPLE] = { .name = "adi,sample", .flags = GPIOD_IN },
> - [AD2S1210_A0] = { .name = "adi,a0", .flags = GPIOD_IN },
> - [AD2S1210_A1] = { .name = "adi,a1", .flags = GPIOD_IN },
> - [AD2S1210_RES0] = { .name = "adi,res0", .flags = GPIOD_IN },
> - [AD2S1210_RES1] = { .name = "adi,res1", .flags = GPIOD_IN },
> -};
> -
> -static const struct ad2s1210_gpio gpios_out[] = {
> +static const struct ad2s1210_gpio gpios[] = {
> [AD2S1210_SAMPLE] = { .name = "adi,sample", .flags = GPIOD_OUT_LOW },
> [AD2S1210_A0] = { .name = "adi,a0", .flags = GPIOD_OUT_LOW },
> [AD2S1210_A1] = { .name = "adi,a1", .flags = GPIOD_OUT_LOW },
> @@ -99,7 +91,6 @@ static const struct ad2s1210_gpio gpios_out[] = {
> static const unsigned int ad2s1210_resolution_value[] = { 10, 12, 14, 16 };
>
> struct ad2s1210_state {
> - const struct ad2s1210_platform_data *pdata;
> struct mutex lock;
> struct spi_device *sdev;
> struct gpio_desc *gpios[5];
> @@ -180,14 +171,6 @@ int ad2s1210_update_frequency_control_word(struct ad2s1210_state *st)
> return ad2s1210_config_write(st, fcw);
> }
>
> -static unsigned char ad2s1210_read_resolution_pin(struct ad2s1210_state *st)
> -{
> - int resolution = (gpiod_get_value(st->gpios[AD2S1210_RES0]) << 1) |
> - gpiod_get_value(st->gpios[AD2S1210_RES1]);
> -
> - return ad2s1210_resolution_value[resolution];
> -}
> -
> static const int ad2s1210_res_pins[4][2] = {
> { 0, 0 }, {0, 1}, {1, 0}, {1, 1}
> };
> @@ -333,13 +316,7 @@ static ssize_t ad2s1210_store_control(struct device *dev,
> }
> st->resolution
> = ad2s1210_resolution_value[data & AD2S1210_SET_RESOLUTION];
> - if (st->pdata->gpioin) {
> - data = ad2s1210_read_resolution_pin(st);
> - if (data != st->resolution)
> - dev_warn(dev, "ad2s1210: resolution settings not match\n");
> - } else {
> - ad2s1210_set_resolution_pin(st);
> - }
> + ad2s1210_set_resolution_pin(st);
> ret = len;
> st->hysteresis = !!(data & AD2S1210_ENABLE_HYSTERESIS);
>
> @@ -395,13 +372,7 @@ static ssize_t ad2s1210_store_resolution(struct device *dev,
> }
> st->resolution
> = ad2s1210_resolution_value[data & AD2S1210_SET_RESOLUTION];
> - if (st->pdata->gpioin) {
> - data = ad2s1210_read_resolution_pin(st);
> - if (data != st->resolution)
> - dev_warn(dev, "ad2s1210: resolution settings not match\n");
> - } else {
> - ad2s1210_set_resolution_pin(st);
> - }
> + ad2s1210_set_resolution_pin(st);
> ret = len;
> error_ret:
> mutex_unlock(&st->lock);
> @@ -622,10 +593,7 @@ static int ad2s1210_initial(struct ad2s1210_state *st)
> int ret;
>
> mutex_lock(&st->lock);
> - if (st->pdata->gpioin)
> - st->resolution = ad2s1210_read_resolution_pin(st);
> - else
> - ad2s1210_set_resolution_pin(st);
> + ad2s1210_set_resolution_pin(st);
>
> ret = ad2s1210_config_write(st, AD2S1210_REG_CONTROL);
> if (ret < 0)
> @@ -660,11 +628,11 @@ static const struct iio_info ad2s1210_info = {
>
> static int ad2s1210_setup_gpios(struct ad2s1210_state *st)
> {
> - struct ad2s1210_gpio *pin = st->pdata->gpioin ? &gpios_in[0] : &gpios_out[0];
> + struct ad2s1210_gpio *pin = &gpios[0];
This local parameter no longer does anything useful so dropped it.
> struct spi_device *spi = st->sdev;
> int i, ret;
>
> - for (i = 0; i < ARRAY_SIZE(gpios_in); i++) {
> + for (i = 0; i < ARRAY_SIZE(gpios); i++) {
> st->gpios[i] = devm_gpiod_get(&spi->dev, pin[i].name,
> pin[i].flags);
> if (IS_ERR(st->gpios[i])) {
> @@ -692,7 +660,6 @@ static int ad2s1210_probe(struct spi_device *spi)
> if (!indio_dev)
> return -ENOMEM;
> st = iio_priv(indio_dev);
> - st->pdata = spi->dev.platform_data;
> ret = ad2s1210_setup_gpios(st);
> if (ret < 0)
> return ret;
> diff --git a/drivers/staging/iio/resolver/ad2s1210.h b/drivers/staging/iio/resolver/ad2s1210.h
> index 63d479b20a6c..e69de29bb2d1 100644
> --- a/drivers/staging/iio/resolver/ad2s1210.h
> +++ b/drivers/staging/iio/resolver/ad2s1210.h
> @@ -1,17 +0,0 @@
> -/*
> - * ad2s1210.h plaform data for the ADI Resolver to Digital Converters:
> - * AD2S1210
> - *
> - * Copyright (c) 2010-2010 Analog Devices Inc.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - */
> -#ifndef _AD2S1210_H
> -#define _AD2S1210_H
> -
> -struct ad2s1210_platform_data {
> - bool gpioin;
> -};
> -#endif /* _AD2S1210_H */
