aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/adc/ad799x_core.c
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-06-27 08:07:20 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-28 17:39:37 -0400
commitd8aea29b6289d4b849a7679b50e5bcd18553e447 (patch)
treefae0cb6753c7dfe0da601cff285f1c70b59dc3f1 /drivers/staging/iio/adc/ad799x_core.c
parentf490f42bdfee9893e5250d592254534624be891b (diff)
staging:iio:adc:ad799x clear out last few uses of iio_dev->dev_data.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc/ad799x_core.c')
-rw-r--r--drivers/staging/iio/adc/ad799x_core.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index 29bfbcf8206..92cfe2e3ea4 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -143,7 +143,7 @@ static int ad799x_read_raw(struct iio_dev *dev_info,
143 long m) 143 long m)
144{ 144{
145 int ret; 145 int ret;
146 struct ad799x_state *st = dev_info->dev_data; 146 struct ad799x_state *st = iio_priv(dev_info);
147 unsigned int scale_uv; 147 unsigned int scale_uv;
148 148
149 switch (m) { 149 switch (m) {
@@ -176,7 +176,7 @@ static ssize_t ad799x_read_frequency(struct device *dev,
176 char *buf) 176 char *buf)
177{ 177{
178 struct iio_dev *dev_info = dev_get_drvdata(dev); 178 struct iio_dev *dev_info = dev_get_drvdata(dev);
179 struct ad799x_state *st = iio_dev_get_devdata(dev_info); 179 struct ad799x_state *st = iio_priv(dev_info);
180 180
181 int ret, len = 0; 181 int ret, len = 0;
182 u8 val; 182 u8 val;
@@ -221,7 +221,7 @@ static ssize_t ad799x_write_frequency(struct device *dev,
221 size_t len) 221 size_t len)
222{ 222{
223 struct iio_dev *dev_info = dev_get_drvdata(dev); 223 struct iio_dev *dev_info = dev_get_drvdata(dev);
224 struct ad799x_state *st = iio_dev_get_devdata(dev_info); 224 struct ad799x_state *st = iio_priv(dev_info);
225 225
226 long val; 226 long val;
227 int ret; 227 int ret;
@@ -281,7 +281,7 @@ static ssize_t ad799x_read_channel_config(struct device *dev,
281 char *buf) 281 char *buf)
282{ 282{
283 struct iio_dev *dev_info = dev_get_drvdata(dev); 283 struct iio_dev *dev_info = dev_get_drvdata(dev);
284 struct ad799x_state *st = iio_dev_get_devdata(dev_info); 284 struct ad799x_state *st = iio_priv(dev_info);
285 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); 285 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
286 286
287 int ret; 287 int ret;
@@ -299,7 +299,7 @@ static ssize_t ad799x_write_channel_config(struct device *dev,
299 size_t len) 299 size_t len)
300{ 300{
301 struct iio_dev *dev_info = dev_get_drvdata(dev); 301 struct iio_dev *dev_info = dev_get_drvdata(dev);
302 struct ad799x_state *st = iio_dev_get_devdata(dev_info); 302 struct ad799x_state *st = iio_priv(dev_info);
303 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); 303 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
304 304
305 long val; 305 long val;
@@ -319,7 +319,7 @@ static ssize_t ad799x_write_channel_config(struct device *dev,
319static irqreturn_t ad799x_event_handler(int irq, void *private) 319static irqreturn_t ad799x_event_handler(int irq, void *private)
320{ 320{
321 struct iio_dev *indio_dev = private; 321 struct iio_dev *indio_dev = private;
322 struct ad799x_state *st = iio_dev_get_devdata(private); 322 struct ad799x_state *st = iio_priv(private);
323 u8 status; 323 u8 status;
324 int i, ret; 324 int i, ret;
325 325
@@ -686,7 +686,6 @@ static int __devinit ad799x_probe(struct i2c_client *client,
686 indio_dev->name = id->name; 686 indio_dev->name = id->name;
687 indio_dev->info = st->chip_info->info; 687 indio_dev->info = st->chip_info->info;
688 indio_dev->name = id->name; 688 indio_dev->name = id->name;
689 indio_dev->dev_data = (void *)(st);
690 689
691 indio_dev->modes = INDIO_DIRECT_MODE; 690 indio_dev->modes = INDIO_DIRECT_MODE;
692 indio_dev->channels = st->chip_info->channel; 691 indio_dev->channels = st->chip_info->channel;