Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e53f5ac52ec19c8c606aeacdd13fed2a03d7365a

Authored by Lars-Peter Clausen
Committed by Greg Kroah-Hartman
1 parent 7a7913f11d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

iio: Use dev_to_iio_dev() 

Replace open-coded instances of getting a iio_dev struct from a device struct
with dev_to_iio_dev().

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 4 changed files with 20 additions and 20 deletions Side-by-side Diff

drivers/iio/industrialio-buffer.c
Diff comments   View file @ e53f5ac
... ... @@ -105,7 +105,7 @@
105 105 char *buf)
106 106 {
107 107 int ret;
108   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  108 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
109 109  
110 110 ret = test_bit(to_iio_dev_attr(attr)->address,
111 111 indio_dev->buffer->scan_mask);
... ... @@ -126,7 +126,7 @@
126 126 {
127 127 int ret;
128 128 bool state;
129   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  129 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
130 130 struct iio_buffer *buffer = indio_dev->buffer;
131 131 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
132 132  
... ... @@ -162,7 +162,7 @@
162 162 struct device_attribute *attr,
163 163 char *buf)
164 164 {
165   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  165 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
166 166 return sprintf(buf, "%d\n", indio_dev->buffer->scan_timestamp);
167 167 }
168 168  
... ... @@ -172,7 +172,7 @@
172 172 size_t len)
173 173 {
174 174 int ret;
175   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  175 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
176 176 bool state;
177 177  
178 178 ret = strtobool(buf, &state);
... ... @@ -352,7 +352,7 @@
352 352 struct device_attribute *attr,
353 353 char *buf)
354 354 {
355   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  355 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
356 356 struct iio_buffer *buffer = indio_dev->buffer;
357 357  
358 358 if (buffer->access->get_length)
... ... @@ -370,7 +370,7 @@
370 370 {
371 371 int ret;
372 372 ulong val;
373   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  373 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
374 374 struct iio_buffer *buffer = indio_dev->buffer;
375 375  
376 376 ret = strict_strtoul(buf, 10, &val);
... ... @@ -403,7 +403,7 @@
403 403 int ret;
404 404 bool requested_state, current_state;
405 405 int previous_mode;
406   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  406 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
407 407 struct iio_buffer *buffer = indio_dev->buffer;
408 408  
409 409 mutex_lock(&indio_dev->mlock);
... ... @@ -489,7 +489,7 @@
489 489 struct device_attribute *attr,
490 490 char *buf)
491 491 {
492   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  492 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
493 493 return sprintf(buf, "%d\n", iio_buffer_enabled(indio_dev));
494 494 }
495 495 EXPORT_SYMBOL(iio_buffer_show_enable);
drivers/iio/industrialio-core.c
Diff comments   View file @ e53f5ac
... ... @@ -265,7 +265,7 @@
265 265 struct device_attribute *attr,
266 266 char *buf)
267 267 {
268   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  268 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
269 269 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
270 270 const struct iio_chan_spec_ext_info *ext_info;
271 271  
... ... @@ -279,7 +279,7 @@
279 279 const char *buf,
280 280 size_t len)
281 281 {
282   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  282 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
283 283 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
284 284 const struct iio_chan_spec_ext_info *ext_info;
285 285  
... ... @@ -293,7 +293,7 @@
293 293 struct device_attribute *attr,
294 294 char *buf)
295 295 {
296   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  296 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
297 297 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
298 298 int val, val2;
299 299 bool scale_db = false;
... ... @@ -330,7 +330,7 @@
330 330 const char *buf,
331 331 size_t len)
332 332 {
333   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  333 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
334 334 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
335 335 int ret, integer = 0, fract = 0, fract_mult = 100000;
336 336 bool integer_part = true, negative = false;
... ... @@ -638,7 +638,7 @@
638 638 struct device_attribute *attr,
639 639 char *buf)
640 640 {
641   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  641 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
642 642 return sprintf(buf, "%s\n", indio_dev->name);
643 643 }
644 644  
... ... @@ -724,7 +724,7 @@
724 724  
725 725 static void iio_dev_release(struct device *device)
726 726 {
727   - struct iio_dev *indio_dev = container_of(device, struct iio_dev, dev);
  727 + struct iio_dev *indio_dev = dev_to_iio_dev(device);
728 728 cdev_del(&indio_dev->chrdev);
729 729 if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
730 730 iio_device_unregister_trigger_consumer(indio_dev);
drivers/iio/industrialio-event.c
Diff comments   View file @ e53f5ac
... ... @@ -186,7 +186,7 @@
186 186 const char *buf,
187 187 size_t len)
188 188 {
189   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  189 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
190 190 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
191 191 int ret;
192 192 bool val;
... ... @@ -205,7 +205,7 @@
205 205 struct device_attribute *attr,
206 206 char *buf)
207 207 {
208   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  208 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
209 209 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
210 210 int val = indio_dev->info->read_event_config(indio_dev,
211 211 this_attr->address);
... ... @@ -220,7 +220,7 @@
220 220 struct device_attribute *attr,
221 221 char *buf)
222 222 {
223   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  223 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
224 224 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
225 225 int val, ret;
226 226  
... ... @@ -237,7 +237,7 @@
237 237 const char *buf,
238 238 size_t len)
239 239 {
240   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  240 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
241 241 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
242 242 unsigned long val;
243 243 int ret;
drivers/iio/industrialio-trigger.c
Diff comments   View file @ e53f5ac
... ... @@ -310,7 +310,7 @@
310 310 struct device_attribute *attr,
311 311 char *buf)
312 312 {
313   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  313 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
314 314  
315 315 if (indio_dev->trig)
316 316 return sprintf(buf, "%s\n", indio_dev->trig->name);
... ... @@ -329,7 +329,7 @@
329 329 const char *buf,
330 330 size_t len)
331 331 {
332   - struct iio_dev *indio_dev = dev_get_drvdata(dev);
  332 + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
333 333 struct iio_trigger *oldtrig = indio_dev->trig;
334 334 struct iio_trigger *trig;
335 335 int ret;