diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2016-10-19 19:06:58 +0200 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-10-23 19:34:12 +0100 |
| commit | 9f72520fa4e0a1c3060c523ca075f323b9c77488 (patch) | |
| tree | 3097e97fec55230f174feef8001eb018d7c07384 /drivers/staging/iio/adc | |
| parent | 063a51c5bdefaf7972c6ee7945b05eeb7a842961 (diff) | |
| download | linux-stable-9f72520fa4e0a1c3060c523ca075f323b9c77488.tar.gz linux-stable-9f72520fa4e0a1c3060c523ca075f323b9c77488.tar.bz2 linux-stable-9f72520fa4e0a1c3060c523ca075f323b9c77488.zip | |
staging:iio:ad7606: Remove default device configuration from platform data
While for some very selected setups it might be useful to be able to
provide default configuration data via the platform data, generally this
becomes very impractical as the number of configuration options increases.
So the general policy is to use the power-on default values of the device
and let the application using the device configure it according to its
needs.
Implement this scheme for the ad7606 driver by removing support for
specifying a default configuration via the platform data.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio/adc')
| -rw-r--r-- | drivers/staging/iio/adc/ad7606.h | 4 | ||||
| -rw-r--r-- | drivers/staging/iio/adc/ad7606_core.c | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h index 380c56ae6570..cf6be6500bfb 100644 --- a/drivers/staging/iio/adc/ad7606.h +++ b/drivers/staging/iio/adc/ad7606.h @@ -15,8 +15,6 @@ /** * struct ad7606_platform_data - platform/board specific information - * @default_os: default oversampling value {0, 2, 4, 8, 16, 32, 64} - * @default_range: default range +/-{5000, 10000} mVolt * @gpio_convst: number of gpio connected to the CONVST pin * @gpio_reset: gpio connected to the RESET pin, if not used set to -1 * @gpio_range: gpio connected to the RANGE pin, if not used set to -1 @@ -28,8 +26,6 @@ */ struct ad7606_platform_data { - unsigned int default_os; - unsigned int default_range; unsigned int gpio_convst; unsigned int gpio_reset; unsigned int gpio_range; diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c index 109364750ac7..a16c6f5a333b 100644 --- a/drivers/staging/iio/adc/ad7606_core.c +++ b/drivers/staging/iio/adc/ad7606_core.c @@ -452,16 +452,8 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, st->dev = dev; st->bops = bops; st->base_address = base_address; - st->range = pdata->default_range == 10000 ? 10000 : 5000; - - ret = ad7606_oversampling_get_index(pdata->default_os); - if (ret < 0) { - dev_warn(dev, "oversampling %d is not supported\n", - pdata->default_os); - st->oversampling = 0; - } else { - st->oversampling = pdata->default_os; - } + st->range = 5000; + st->oversampling = 0; st->reg = devm_regulator_get(dev, "vcc"); if (!IS_ERR(st->reg)) { |