summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/adc/ad7192.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 405d9a8d7b6d..cdb4fc4ef820 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -136,7 +136,6 @@ struct ad7192_state {
136 struct spi_device *spi; 136 struct spi_device *spi;
137 struct iio_trigger *trig; 137 struct iio_trigger *trig;
138 struct regulator *reg; 138 struct regulator *reg;
139 struct ad7192_platform_data *pdata;
140 wait_queue_head_t wq_data_avail; 139 wait_queue_head_t wq_data_avail;
141 bool done; 140 bool done;
142 bool irq_dis; 141 bool irq_dis;
@@ -347,10 +346,10 @@ out:
347 return ret; 346 return ret;
348} 347}
349 348
350static int ad7192_setup(struct ad7192_state *st) 349static int ad7192_setup(struct ad7192_state *st,
350 const struct ad7192_platform_data *pdata)
351{ 351{
352 struct iio_dev *indio_dev = spi_get_drvdata(st->spi); 352 struct iio_dev *indio_dev = spi_get_drvdata(st->spi);
353 struct ad7192_platform_data *pdata = st->pdata;
354 unsigned long long scale_uv; 353 unsigned long long scale_uv;
355 int i, ret, id; 354 int i, ret, id;
356 u8 ones[6]; 355 u8 ones[6];
@@ -985,7 +984,7 @@ static const struct iio_chan_spec ad7192_channels[] = {
985 984
986static int __devinit ad7192_probe(struct spi_device *spi) 985static int __devinit ad7192_probe(struct spi_device *spi)
987{ 986{
988 struct ad7192_platform_data *pdata = spi->dev.platform_data; 987 const struct ad7192_platform_data *pdata = spi->dev.platform_data;
989 struct ad7192_state *st; 988 struct ad7192_state *st;
990 struct iio_dev *indio_dev; 989 struct iio_dev *indio_dev;
991 int ret , voltage_uv = 0; 990 int ret , voltage_uv = 0;
@@ -1015,8 +1014,6 @@ static int __devinit ad7192_probe(struct spi_device *spi)
1015 voltage_uv = regulator_get_voltage(st->reg); 1014 voltage_uv = regulator_get_voltage(st->reg);
1016 } 1015 }
1017 1016
1018 st->pdata = pdata;
1019
1020 if (pdata && pdata->vref_mv) 1017 if (pdata && pdata->vref_mv)
1021 st->int_vref_mv = pdata->vref_mv; 1018 st->int_vref_mv = pdata->vref_mv;
1022 else if (voltage_uv) 1019 else if (voltage_uv)
@@ -1047,7 +1044,7 @@ static int __devinit ad7192_probe(struct spi_device *spi)
1047 if (ret) 1044 if (ret)
1048 goto error_ring_cleanup; 1045 goto error_ring_cleanup;
1049 1046
1050 ret = ad7192_setup(st); 1047 ret = ad7192_setup(st, pdata);
1051 if (ret) 1048 if (ret)
1052 goto error_remove_trigger; 1049 goto error_remove_trigger;
1053 1050