diff options
Diffstat (limited to 'drivers/iio/dac')
-rw-r--r-- | drivers/iio/dac/ad5064.c | 18 | ||||
-rw-r--r-- | drivers/iio/dac/ad5360.c | 8 | ||||
-rw-r--r-- | drivers/iio/dac/ad5380.c | 22 | ||||
-rw-r--r-- | drivers/iio/dac/ad5421.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/ad5446.c | 18 | ||||
-rw-r--r-- | drivers/iio/dac/ad5449.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/ad5504.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/ad5624r_spi.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/ad5686.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/ad5755.c | 16 | ||||
-rw-r--r-- | drivers/iio/dac/ad5764.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/ad5791.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/max517.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/mcp4725.c | 8 |
14 files changed, 69 insertions, 69 deletions
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c index eb281a2c295b..2fe1d4edcb2f 100644 --- a/drivers/iio/dac/ad5064.c +++ b/drivers/iio/dac/ad5064.c | |||
@@ -424,8 +424,8 @@ static const char * const ad5064_vref_name(struct ad5064_state *st, | |||
424 | return st->chip_info->shared_vref ? "vref" : ad5064_vref_names[vref]; | 424 | return st->chip_info->shared_vref ? "vref" : ad5064_vref_names[vref]; |
425 | } | 425 | } |
426 | 426 | ||
427 | static int __devinit ad5064_probe(struct device *dev, enum ad5064_type type, | 427 | static int ad5064_probe(struct device *dev, enum ad5064_type type, |
428 | const char *name, ad5064_write_func write) | 428 | const char *name, ad5064_write_func write) |
429 | { | 429 | { |
430 | struct iio_dev *indio_dev; | 430 | struct iio_dev *indio_dev; |
431 | struct ad5064_state *st; | 431 | struct ad5064_state *st; |
@@ -495,7 +495,7 @@ error_free: | |||
495 | return ret; | 495 | return ret; |
496 | } | 496 | } |
497 | 497 | ||
498 | static int __devexit ad5064_remove(struct device *dev) | 498 | static int ad5064_remove(struct device *dev) |
499 | { | 499 | { |
500 | struct iio_dev *indio_dev = dev_get_drvdata(dev); | 500 | struct iio_dev *indio_dev = dev_get_drvdata(dev); |
501 | struct ad5064_state *st = iio_priv(indio_dev); | 501 | struct ad5064_state *st = iio_priv(indio_dev); |
@@ -523,7 +523,7 @@ static int ad5064_spi_write(struct ad5064_state *st, unsigned int cmd, | |||
523 | return spi_write(spi, &st->data.spi, sizeof(st->data.spi)); | 523 | return spi_write(spi, &st->data.spi, sizeof(st->data.spi)); |
524 | } | 524 | } |
525 | 525 | ||
526 | static int __devinit ad5064_spi_probe(struct spi_device *spi) | 526 | static int ad5064_spi_probe(struct spi_device *spi) |
527 | { | 527 | { |
528 | const struct spi_device_id *id = spi_get_device_id(spi); | 528 | const struct spi_device_id *id = spi_get_device_id(spi); |
529 | 529 | ||
@@ -531,7 +531,7 @@ static int __devinit ad5064_spi_probe(struct spi_device *spi) | |||
531 | ad5064_spi_write); | 531 | ad5064_spi_write); |
532 | } | 532 | } |
533 | 533 | ||
534 | static int __devexit ad5064_spi_remove(struct spi_device *spi) | 534 | static int ad5064_spi_remove(struct spi_device *spi) |
535 | { | 535 | { |
536 | return ad5064_remove(&spi->dev); | 536 | return ad5064_remove(&spi->dev); |
537 | } | 537 | } |
@@ -563,7 +563,7 @@ static struct spi_driver ad5064_spi_driver = { | |||
563 | .owner = THIS_MODULE, | 563 | .owner = THIS_MODULE, |
564 | }, | 564 | }, |
565 | .probe = ad5064_spi_probe, | 565 | .probe = ad5064_spi_probe, |
566 | .remove = __devexit_p(ad5064_spi_remove), | 566 | .remove = ad5064_spi_remove, |
567 | .id_table = ad5064_spi_ids, | 567 | .id_table = ad5064_spi_ids, |
568 | }; | 568 | }; |
569 | 569 | ||
@@ -596,14 +596,14 @@ static int ad5064_i2c_write(struct ad5064_state *st, unsigned int cmd, | |||
596 | return i2c_master_send(i2c, st->data.i2c, 3); | 596 | return i2c_master_send(i2c, st->data.i2c, 3); |
597 | } | 597 | } |
598 | 598 | ||
599 | static int __devinit ad5064_i2c_probe(struct i2c_client *i2c, | 599 | static int ad5064_i2c_probe(struct i2c_client *i2c, |
600 | const struct i2c_device_id *id) | 600 | const struct i2c_device_id *id) |
601 | { | 601 | { |
602 | return ad5064_probe(&i2c->dev, id->driver_data, id->name, | 602 | return ad5064_probe(&i2c->dev, id->driver_data, id->name, |
603 | ad5064_i2c_write); | 603 | ad5064_i2c_write); |
604 | } | 604 | } |
605 | 605 | ||
606 | static int __devexit ad5064_i2c_remove(struct i2c_client *i2c) | 606 | static int ad5064_i2c_remove(struct i2c_client *i2c) |
607 | { | 607 | { |
608 | return ad5064_remove(&i2c->dev); | 608 | return ad5064_remove(&i2c->dev); |
609 | } | 609 | } |
@@ -625,7 +625,7 @@ static struct i2c_driver ad5064_i2c_driver = { | |||
625 | .owner = THIS_MODULE, | 625 | .owner = THIS_MODULE, |
626 | }, | 626 | }, |
627 | .probe = ad5064_i2c_probe, | 627 | .probe = ad5064_i2c_probe, |
628 | .remove = __devexit_p(ad5064_i2c_remove), | 628 | .remove = ad5064_i2c_remove, |
629 | .id_table = ad5064_i2c_ids, | 629 | .id_table = ad5064_i2c_ids, |
630 | }; | 630 | }; |
631 | 631 | ||
diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c index 8fce84fe70b1..54b46fd3aede 100644 --- a/drivers/iio/dac/ad5360.c +++ b/drivers/iio/dac/ad5360.c | |||
@@ -433,7 +433,7 @@ static const char * const ad5360_vref_name[] = { | |||
433 | "vref0", "vref1", "vref2" | 433 | "vref0", "vref1", "vref2" |
434 | }; | 434 | }; |
435 | 435 | ||
436 | static int __devinit ad5360_alloc_channels(struct iio_dev *indio_dev) | 436 | static int ad5360_alloc_channels(struct iio_dev *indio_dev) |
437 | { | 437 | { |
438 | struct ad5360_state *st = iio_priv(indio_dev); | 438 | struct ad5360_state *st = iio_priv(indio_dev); |
439 | struct iio_chan_spec *channels; | 439 | struct iio_chan_spec *channels; |
@@ -456,7 +456,7 @@ static int __devinit ad5360_alloc_channels(struct iio_dev *indio_dev) | |||
456 | return 0; | 456 | return 0; |
457 | } | 457 | } |
458 | 458 | ||
459 | static int __devinit ad5360_probe(struct spi_device *spi) | 459 | static int ad5360_probe(struct spi_device *spi) |
460 | { | 460 | { |
461 | enum ad5360_type type = spi_get_device_id(spi)->driver_data; | 461 | enum ad5360_type type = spi_get_device_id(spi)->driver_data; |
462 | struct iio_dev *indio_dev; | 462 | struct iio_dev *indio_dev; |
@@ -524,7 +524,7 @@ error_free: | |||
524 | return ret; | 524 | return ret; |
525 | } | 525 | } |
526 | 526 | ||
527 | static int __devexit ad5360_remove(struct spi_device *spi) | 527 | static int ad5360_remove(struct spi_device *spi) |
528 | { | 528 | { |
529 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 529 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
530 | struct ad5360_state *st = iio_priv(indio_dev); | 530 | struct ad5360_state *st = iio_priv(indio_dev); |
@@ -560,7 +560,7 @@ static struct spi_driver ad5360_driver = { | |||
560 | .owner = THIS_MODULE, | 560 | .owner = THIS_MODULE, |
561 | }, | 561 | }, |
562 | .probe = ad5360_probe, | 562 | .probe = ad5360_probe, |
563 | .remove = __devexit_p(ad5360_remove), | 563 | .remove = ad5360_remove, |
564 | .id_table = ad5360_ids, | 564 | .id_table = ad5360_ids, |
565 | }; | 565 | }; |
566 | module_spi_driver(ad5360_driver); | 566 | module_spi_driver(ad5360_driver); |
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c index 14991ac55f26..6c7898c765d9 100644 --- a/drivers/iio/dac/ad5380.c +++ b/drivers/iio/dac/ad5380.c | |||
@@ -338,7 +338,7 @@ static const struct ad5380_chip_info ad5380_chip_info_tbl[] = { | |||
338 | }, | 338 | }, |
339 | }; | 339 | }; |
340 | 340 | ||
341 | static int __devinit ad5380_alloc_channels(struct iio_dev *indio_dev) | 341 | static int ad5380_alloc_channels(struct iio_dev *indio_dev) |
342 | { | 342 | { |
343 | struct ad5380_state *st = iio_priv(indio_dev); | 343 | struct ad5380_state *st = iio_priv(indio_dev); |
344 | struct iio_chan_spec *channels; | 344 | struct iio_chan_spec *channels; |
@@ -361,8 +361,8 @@ static int __devinit ad5380_alloc_channels(struct iio_dev *indio_dev) | |||
361 | return 0; | 361 | return 0; |
362 | } | 362 | } |
363 | 363 | ||
364 | static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap, | 364 | static int ad5380_probe(struct device *dev, struct regmap *regmap, |
365 | enum ad5380_type type, const char *name) | 365 | enum ad5380_type type, const char *name) |
366 | { | 366 | { |
367 | struct iio_dev *indio_dev; | 367 | struct iio_dev *indio_dev; |
368 | struct ad5380_state *st; | 368 | struct ad5380_state *st; |
@@ -441,7 +441,7 @@ error_out: | |||
441 | return ret; | 441 | return ret; |
442 | } | 442 | } |
443 | 443 | ||
444 | static int __devexit ad5380_remove(struct device *dev) | 444 | static int ad5380_remove(struct device *dev) |
445 | { | 445 | { |
446 | struct iio_dev *indio_dev = dev_get_drvdata(dev); | 446 | struct iio_dev *indio_dev = dev_get_drvdata(dev); |
447 | struct ad5380_state *st = iio_priv(indio_dev); | 447 | struct ad5380_state *st = iio_priv(indio_dev); |
@@ -478,7 +478,7 @@ static const struct regmap_config ad5380_regmap_config = { | |||
478 | 478 | ||
479 | #if IS_ENABLED(CONFIG_SPI_MASTER) | 479 | #if IS_ENABLED(CONFIG_SPI_MASTER) |
480 | 480 | ||
481 | static int __devinit ad5380_spi_probe(struct spi_device *spi) | 481 | static int ad5380_spi_probe(struct spi_device *spi) |
482 | { | 482 | { |
483 | const struct spi_device_id *id = spi_get_device_id(spi); | 483 | const struct spi_device_id *id = spi_get_device_id(spi); |
484 | struct regmap *regmap; | 484 | struct regmap *regmap; |
@@ -491,7 +491,7 @@ static int __devinit ad5380_spi_probe(struct spi_device *spi) | |||
491 | return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name); | 491 | return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name); |
492 | } | 492 | } |
493 | 493 | ||
494 | static int __devexit ad5380_spi_remove(struct spi_device *spi) | 494 | static int ad5380_spi_remove(struct spi_device *spi) |
495 | { | 495 | { |
496 | return ad5380_remove(&spi->dev); | 496 | return ad5380_remove(&spi->dev); |
497 | } | 497 | } |
@@ -523,7 +523,7 @@ static struct spi_driver ad5380_spi_driver = { | |||
523 | .owner = THIS_MODULE, | 523 | .owner = THIS_MODULE, |
524 | }, | 524 | }, |
525 | .probe = ad5380_spi_probe, | 525 | .probe = ad5380_spi_probe, |
526 | .remove = __devexit_p(ad5380_spi_remove), | 526 | .remove = ad5380_spi_remove, |
527 | .id_table = ad5380_spi_ids, | 527 | .id_table = ad5380_spi_ids, |
528 | }; | 528 | }; |
529 | 529 | ||
@@ -552,8 +552,8 @@ static inline void ad5380_spi_unregister_driver(void) | |||
552 | 552 | ||
553 | #if IS_ENABLED(CONFIG_I2C) | 553 | #if IS_ENABLED(CONFIG_I2C) |
554 | 554 | ||
555 | static int __devinit ad5380_i2c_probe(struct i2c_client *i2c, | 555 | static int ad5380_i2c_probe(struct i2c_client *i2c, |
556 | const struct i2c_device_id *id) | 556 | const struct i2c_device_id *id) |
557 | { | 557 | { |
558 | struct regmap *regmap; | 558 | struct regmap *regmap; |
559 | 559 | ||
@@ -565,7 +565,7 @@ static int __devinit ad5380_i2c_probe(struct i2c_client *i2c, | |||
565 | return ad5380_probe(&i2c->dev, regmap, id->driver_data, id->name); | 565 | return ad5380_probe(&i2c->dev, regmap, id->driver_data, id->name); |
566 | } | 566 | } |
567 | 567 | ||
568 | static int __devexit ad5380_i2c_remove(struct i2c_client *i2c) | 568 | static int ad5380_i2c_remove(struct i2c_client *i2c) |
569 | { | 569 | { |
570 | return ad5380_remove(&i2c->dev); | 570 | return ad5380_remove(&i2c->dev); |
571 | } | 571 | } |
@@ -597,7 +597,7 @@ static struct i2c_driver ad5380_i2c_driver = { | |||
597 | .owner = THIS_MODULE, | 597 | .owner = THIS_MODULE, |
598 | }, | 598 | }, |
599 | .probe = ad5380_i2c_probe, | 599 | .probe = ad5380_i2c_probe, |
600 | .remove = __devexit_p(ad5380_i2c_remove), | 600 | .remove = ad5380_i2c_remove, |
601 | .id_table = ad5380_i2c_ids, | 601 | .id_table = ad5380_i2c_ids, |
602 | }; | 602 | }; |
603 | 603 | ||
diff --git a/drivers/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c index cdbc5bf25c31..43be948db83e 100644 --- a/drivers/iio/dac/ad5421.c +++ b/drivers/iio/dac/ad5421.c | |||
@@ -449,7 +449,7 @@ static const struct iio_info ad5421_info = { | |||
449 | .driver_module = THIS_MODULE, | 449 | .driver_module = THIS_MODULE, |
450 | }; | 450 | }; |
451 | 451 | ||
452 | static int __devinit ad5421_probe(struct spi_device *spi) | 452 | static int ad5421_probe(struct spi_device *spi) |
453 | { | 453 | { |
454 | struct ad5421_platform_data *pdata = dev_get_platdata(&spi->dev); | 454 | struct ad5421_platform_data *pdata = dev_get_platdata(&spi->dev); |
455 | struct iio_dev *indio_dev; | 455 | struct iio_dev *indio_dev; |
@@ -516,7 +516,7 @@ error_free: | |||
516 | return ret; | 516 | return ret; |
517 | } | 517 | } |
518 | 518 | ||
519 | static int __devexit ad5421_remove(struct spi_device *spi) | 519 | static int ad5421_remove(struct spi_device *spi) |
520 | { | 520 | { |
521 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 521 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
522 | 522 | ||
@@ -534,7 +534,7 @@ static struct spi_driver ad5421_driver = { | |||
534 | .owner = THIS_MODULE, | 534 | .owner = THIS_MODULE, |
535 | }, | 535 | }, |
536 | .probe = ad5421_probe, | 536 | .probe = ad5421_probe, |
537 | .remove = __devexit_p(ad5421_remove), | 537 | .remove = ad5421_remove, |
538 | }; | 538 | }; |
539 | module_spi_driver(ad5421_driver); | 539 | module_spi_driver(ad5421_driver); |
540 | 540 | ||
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c index 3310cbbd41e7..29f653dab2f7 100644 --- a/drivers/iio/dac/ad5446.c +++ b/drivers/iio/dac/ad5446.c | |||
@@ -212,8 +212,8 @@ static const struct iio_info ad5446_info = { | |||
212 | .driver_module = THIS_MODULE, | 212 | .driver_module = THIS_MODULE, |
213 | }; | 213 | }; |
214 | 214 | ||
215 | static int __devinit ad5446_probe(struct device *dev, const char *name, | 215 | static int ad5446_probe(struct device *dev, const char *name, |
216 | const struct ad5446_chip_info *chip_info) | 216 | const struct ad5446_chip_info *chip_info) |
217 | { | 217 | { |
218 | struct ad5446_state *st; | 218 | struct ad5446_state *st; |
219 | struct iio_dev *indio_dev; | 219 | struct iio_dev *indio_dev; |
@@ -461,7 +461,7 @@ static const struct spi_device_id ad5446_spi_ids[] = { | |||
461 | }; | 461 | }; |
462 | MODULE_DEVICE_TABLE(spi, ad5446_spi_ids); | 462 | MODULE_DEVICE_TABLE(spi, ad5446_spi_ids); |
463 | 463 | ||
464 | static int __devinit ad5446_spi_probe(struct spi_device *spi) | 464 | static int ad5446_spi_probe(struct spi_device *spi) |
465 | { | 465 | { |
466 | const struct spi_device_id *id = spi_get_device_id(spi); | 466 | const struct spi_device_id *id = spi_get_device_id(spi); |
467 | 467 | ||
@@ -469,7 +469,7 @@ static int __devinit ad5446_spi_probe(struct spi_device *spi) | |||
469 | &ad5446_spi_chip_info[id->driver_data]); | 469 | &ad5446_spi_chip_info[id->driver_data]); |
470 | } | 470 | } |
471 | 471 | ||
472 | static int __devexit ad5446_spi_remove(struct spi_device *spi) | 472 | static int ad5446_spi_remove(struct spi_device *spi) |
473 | { | 473 | { |
474 | return ad5446_remove(&spi->dev); | 474 | return ad5446_remove(&spi->dev); |
475 | } | 475 | } |
@@ -480,7 +480,7 @@ static struct spi_driver ad5446_spi_driver = { | |||
480 | .owner = THIS_MODULE, | 480 | .owner = THIS_MODULE, |
481 | }, | 481 | }, |
482 | .probe = ad5446_spi_probe, | 482 | .probe = ad5446_spi_probe, |
483 | .remove = __devexit_p(ad5446_spi_remove), | 483 | .remove = ad5446_spi_remove, |
484 | .id_table = ad5446_spi_ids, | 484 | .id_table = ad5446_spi_ids, |
485 | }; | 485 | }; |
486 | 486 | ||
@@ -539,14 +539,14 @@ static const struct ad5446_chip_info ad5446_i2c_chip_info[] = { | |||
539 | }, | 539 | }, |
540 | }; | 540 | }; |
541 | 541 | ||
542 | static int __devinit ad5446_i2c_probe(struct i2c_client *i2c, | 542 | static int ad5446_i2c_probe(struct i2c_client *i2c, |
543 | const struct i2c_device_id *id) | 543 | const struct i2c_device_id *id) |
544 | { | 544 | { |
545 | return ad5446_probe(&i2c->dev, id->name, | 545 | return ad5446_probe(&i2c->dev, id->name, |
546 | &ad5446_i2c_chip_info[id->driver_data]); | 546 | &ad5446_i2c_chip_info[id->driver_data]); |
547 | } | 547 | } |
548 | 548 | ||
549 | static int __devexit ad5446_i2c_remove(struct i2c_client *i2c) | 549 | static int ad5446_i2c_remove(struct i2c_client *i2c) |
550 | { | 550 | { |
551 | return ad5446_remove(&i2c->dev); | 551 | return ad5446_remove(&i2c->dev); |
552 | } | 552 | } |
@@ -568,7 +568,7 @@ static struct i2c_driver ad5446_i2c_driver = { | |||
568 | .owner = THIS_MODULE, | 568 | .owner = THIS_MODULE, |
569 | }, | 569 | }, |
570 | .probe = ad5446_i2c_probe, | 570 | .probe = ad5446_i2c_probe, |
571 | .remove = __devexit_p(ad5446_i2c_remove), | 571 | .remove = ad5446_i2c_remove, |
572 | .id_table = ad5446_i2c_ids, | 572 | .id_table = ad5446_i2c_ids, |
573 | }; | 573 | }; |
574 | 574 | ||
diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c index 0ee6f8eeba8d..c4731b7b577b 100644 --- a/drivers/iio/dac/ad5449.c +++ b/drivers/iio/dac/ad5449.c | |||
@@ -266,7 +266,7 @@ static const char *ad5449_vref_name(struct ad5449 *st, int n) | |||
266 | return "VREFB"; | 266 | return "VREFB"; |
267 | } | 267 | } |
268 | 268 | ||
269 | static int __devinit ad5449_spi_probe(struct spi_device *spi) | 269 | static int ad5449_spi_probe(struct spi_device *spi) |
270 | { | 270 | { |
271 | struct ad5449_platform_data *pdata = spi->dev.platform_data; | 271 | struct ad5449_platform_data *pdata = spi->dev.platform_data; |
272 | const struct spi_device_id *id = spi_get_device_id(spi); | 272 | const struct spi_device_id *id = spi_get_device_id(spi); |
@@ -333,7 +333,7 @@ error_free: | |||
333 | return ret; | 333 | return ret; |
334 | } | 334 | } |
335 | 335 | ||
336 | static int __devexit ad5449_spi_remove(struct spi_device *spi) | 336 | static int ad5449_spi_remove(struct spi_device *spi) |
337 | { | 337 | { |
338 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 338 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
339 | struct ad5449 *st = iio_priv(indio_dev); | 339 | struct ad5449 *st = iio_priv(indio_dev); |
@@ -366,7 +366,7 @@ static struct spi_driver ad5449_spi_driver = { | |||
366 | .owner = THIS_MODULE, | 366 | .owner = THIS_MODULE, |
367 | }, | 367 | }, |
368 | .probe = ad5449_spi_probe, | 368 | .probe = ad5449_spi_probe, |
369 | .remove = __devexit_p(ad5449_spi_remove), | 369 | .remove = ad5449_spi_remove, |
370 | .id_table = ad5449_spi_ids, | 370 | .id_table = ad5449_spi_ids, |
371 | }; | 371 | }; |
372 | module_spi_driver(ad5449_spi_driver); | 372 | module_spi_driver(ad5449_spi_driver); |
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index 242bdc7d0044..b2a31a0468ed 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c | |||
@@ -277,7 +277,7 @@ static const struct iio_chan_spec ad5504_channels[] = { | |||
277 | AD5504_CHANNEL(3), | 277 | AD5504_CHANNEL(3), |
278 | }; | 278 | }; |
279 | 279 | ||
280 | static int __devinit ad5504_probe(struct spi_device *spi) | 280 | static int ad5504_probe(struct spi_device *spi) |
281 | { | 281 | { |
282 | struct ad5504_platform_data *pdata = spi->dev.platform_data; | 282 | struct ad5504_platform_data *pdata = spi->dev.platform_data; |
283 | struct iio_dev *indio_dev; | 283 | struct iio_dev *indio_dev; |
@@ -352,7 +352,7 @@ error_ret: | |||
352 | return ret; | 352 | return ret; |
353 | } | 353 | } |
354 | 354 | ||
355 | static int __devexit ad5504_remove(struct spi_device *spi) | 355 | static int ad5504_remove(struct spi_device *spi) |
356 | { | 356 | { |
357 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 357 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
358 | struct ad5504_state *st = iio_priv(indio_dev); | 358 | struct ad5504_state *st = iio_priv(indio_dev); |
@@ -383,7 +383,7 @@ static struct spi_driver ad5504_driver = { | |||
383 | .owner = THIS_MODULE, | 383 | .owner = THIS_MODULE, |
384 | }, | 384 | }, |
385 | .probe = ad5504_probe, | 385 | .probe = ad5504_probe, |
386 | .remove = __devexit_p(ad5504_remove), | 386 | .remove = ad5504_remove, |
387 | .id_table = ad5504_id, | 387 | .id_table = ad5504_id, |
388 | }; | 388 | }; |
389 | module_spi_driver(ad5504_driver); | 389 | module_spi_driver(ad5504_driver); |
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c index 6a7d6a48cc6d..e9947969f9fe 100644 --- a/drivers/iio/dac/ad5624r_spi.c +++ b/drivers/iio/dac/ad5624r_spi.c | |||
@@ -220,7 +220,7 @@ static const struct ad5624r_chip_info ad5624r_chip_info_tbl[] = { | |||
220 | }, | 220 | }, |
221 | }; | 221 | }; |
222 | 222 | ||
223 | static int __devinit ad5624r_probe(struct spi_device *spi) | 223 | static int ad5624r_probe(struct spi_device *spi) |
224 | { | 224 | { |
225 | struct ad5624r_state *st; | 225 | struct ad5624r_state *st; |
226 | struct iio_dev *indio_dev; | 226 | struct iio_dev *indio_dev; |
@@ -282,7 +282,7 @@ error_ret: | |||
282 | return ret; | 282 | return ret; |
283 | } | 283 | } |
284 | 284 | ||
285 | static int __devexit ad5624r_remove(struct spi_device *spi) | 285 | static int ad5624r_remove(struct spi_device *spi) |
286 | { | 286 | { |
287 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 287 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
288 | struct ad5624r_state *st = iio_priv(indio_dev); | 288 | struct ad5624r_state *st = iio_priv(indio_dev); |
@@ -314,7 +314,7 @@ static struct spi_driver ad5624r_driver = { | |||
314 | .owner = THIS_MODULE, | 314 | .owner = THIS_MODULE, |
315 | }, | 315 | }, |
316 | .probe = ad5624r_probe, | 316 | .probe = ad5624r_probe, |
317 | .remove = __devexit_p(ad5624r_remove), | 317 | .remove = ad5624r_remove, |
318 | .id_table = ad5624r_id, | 318 | .id_table = ad5624r_id, |
319 | }; | 319 | }; |
320 | module_spi_driver(ad5624r_driver); | 320 | module_spi_driver(ad5624r_driver); |
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c index bc92ff9309c2..36e51382ae52 100644 --- a/drivers/iio/dac/ad5686.c +++ b/drivers/iio/dac/ad5686.c | |||
@@ -313,7 +313,7 @@ static const struct ad5686_chip_info ad5686_chip_info_tbl[] = { | |||
313 | }; | 313 | }; |
314 | 314 | ||
315 | 315 | ||
316 | static int __devinit ad5686_probe(struct spi_device *spi) | 316 | static int ad5686_probe(struct spi_device *spi) |
317 | { | 317 | { |
318 | struct ad5686_state *st; | 318 | struct ad5686_state *st; |
319 | struct iio_dev *indio_dev; | 319 | struct iio_dev *indio_dev; |
@@ -379,7 +379,7 @@ error_put_reg: | |||
379 | return ret; | 379 | return ret; |
380 | } | 380 | } |
381 | 381 | ||
382 | static int __devexit ad5686_remove(struct spi_device *spi) | 382 | static int ad5686_remove(struct spi_device *spi) |
383 | { | 383 | { |
384 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 384 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
385 | struct ad5686_state *st = iio_priv(indio_dev); | 385 | struct ad5686_state *st = iio_priv(indio_dev); |
@@ -408,7 +408,7 @@ static struct spi_driver ad5686_driver = { | |||
408 | .owner = THIS_MODULE, | 408 | .owner = THIS_MODULE, |
409 | }, | 409 | }, |
410 | .probe = ad5686_probe, | 410 | .probe = ad5686_probe, |
411 | .remove = __devexit_p(ad5686_remove), | 411 | .remove = ad5686_remove, |
412 | .id_table = ad5686_id, | 412 | .id_table = ad5686_id, |
413 | }; | 413 | }; |
414 | module_spi_driver(ad5686_driver); | 414 | module_spi_driver(ad5686_driver); |
diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c index 5db3506034c5..0869bbd27d30 100644 --- a/drivers/iio/dac/ad5755.c +++ b/drivers/iio/dac/ad5755.c | |||
@@ -447,8 +447,8 @@ static bool ad5755_is_valid_mode(struct ad5755_state *st, enum ad5755_mode mode) | |||
447 | } | 447 | } |
448 | } | 448 | } |
449 | 449 | ||
450 | static int __devinit ad5755_setup_pdata(struct iio_dev *indio_dev, | 450 | static int ad5755_setup_pdata(struct iio_dev *indio_dev, |
451 | const struct ad5755_platform_data *pdata) | 451 | const struct ad5755_platform_data *pdata) |
452 | { | 452 | { |
453 | struct ad5755_state *st = iio_priv(indio_dev); | 453 | struct ad5755_state *st = iio_priv(indio_dev); |
454 | unsigned int val; | 454 | unsigned int val; |
@@ -503,7 +503,7 @@ static int __devinit ad5755_setup_pdata(struct iio_dev *indio_dev, | |||
503 | return 0; | 503 | return 0; |
504 | } | 504 | } |
505 | 505 | ||
506 | static bool __devinit ad5755_is_voltage_mode(enum ad5755_mode mode) | 506 | static bool ad5755_is_voltage_mode(enum ad5755_mode mode) |
507 | { | 507 | { |
508 | switch (mode) { | 508 | switch (mode) { |
509 | case AD5755_MODE_VOLTAGE_0V_5V: | 509 | case AD5755_MODE_VOLTAGE_0V_5V: |
@@ -516,8 +516,8 @@ static bool __devinit ad5755_is_voltage_mode(enum ad5755_mode mode) | |||
516 | } | 516 | } |
517 | } | 517 | } |
518 | 518 | ||
519 | static int __devinit ad5755_init_channels(struct iio_dev *indio_dev, | 519 | static int ad5755_init_channels(struct iio_dev *indio_dev, |
520 | const struct ad5755_platform_data *pdata) | 520 | const struct ad5755_platform_data *pdata) |
521 | { | 521 | { |
522 | struct ad5755_state *st = iio_priv(indio_dev); | 522 | struct ad5755_state *st = iio_priv(indio_dev); |
523 | struct iio_chan_spec *channels = st->channels; | 523 | struct iio_chan_spec *channels = st->channels; |
@@ -562,7 +562,7 @@ static const struct ad5755_platform_data ad5755_default_pdata = { | |||
562 | }, | 562 | }, |
563 | }; | 563 | }; |
564 | 564 | ||
565 | static int __devinit ad5755_probe(struct spi_device *spi) | 565 | static int ad5755_probe(struct spi_device *spi) |
566 | { | 566 | { |
567 | enum ad5755_type type = spi_get_device_id(spi)->driver_data; | 567 | enum ad5755_type type = spi_get_device_id(spi)->driver_data; |
568 | const struct ad5755_platform_data *pdata = dev_get_platdata(&spi->dev); | 568 | const struct ad5755_platform_data *pdata = dev_get_platdata(&spi->dev); |
@@ -614,7 +614,7 @@ error_free: | |||
614 | return ret; | 614 | return ret; |
615 | } | 615 | } |
616 | 616 | ||
617 | static int __devexit ad5755_remove(struct spi_device *spi) | 617 | static int ad5755_remove(struct spi_device *spi) |
618 | { | 618 | { |
619 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 619 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
620 | 620 | ||
@@ -640,7 +640,7 @@ static struct spi_driver ad5755_driver = { | |||
640 | .owner = THIS_MODULE, | 640 | .owner = THIS_MODULE, |
641 | }, | 641 | }, |
642 | .probe = ad5755_probe, | 642 | .probe = ad5755_probe, |
643 | .remove = __devexit_p(ad5755_remove), | 643 | .remove = ad5755_remove, |
644 | .id_table = ad5755_id, | 644 | .id_table = ad5755_id, |
645 | }; | 645 | }; |
646 | module_spi_driver(ad5755_driver); | 646 | module_spi_driver(ad5755_driver); |
diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c index ffce30447445..7f9045e6daa4 100644 --- a/drivers/iio/dac/ad5764.c +++ b/drivers/iio/dac/ad5764.c | |||
@@ -273,7 +273,7 @@ static const struct iio_info ad5764_info = { | |||
273 | .driver_module = THIS_MODULE, | 273 | .driver_module = THIS_MODULE, |
274 | }; | 274 | }; |
275 | 275 | ||
276 | static int __devinit ad5764_probe(struct spi_device *spi) | 276 | static int ad5764_probe(struct spi_device *spi) |
277 | { | 277 | { |
278 | enum ad5764_type type = spi_get_device_id(spi)->driver_data; | 278 | enum ad5764_type type = spi_get_device_id(spi)->driver_data; |
279 | struct iio_dev *indio_dev; | 279 | struct iio_dev *indio_dev; |
@@ -340,7 +340,7 @@ error_free: | |||
340 | return ret; | 340 | return ret; |
341 | } | 341 | } |
342 | 342 | ||
343 | static int __devexit ad5764_remove(struct spi_device *spi) | 343 | static int ad5764_remove(struct spi_device *spi) |
344 | { | 344 | { |
345 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 345 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
346 | struct ad5764_state *st = iio_priv(indio_dev); | 346 | struct ad5764_state *st = iio_priv(indio_dev); |
@@ -372,7 +372,7 @@ static struct spi_driver ad5764_driver = { | |||
372 | .owner = THIS_MODULE, | 372 | .owner = THIS_MODULE, |
373 | }, | 373 | }, |
374 | .probe = ad5764_probe, | 374 | .probe = ad5764_probe, |
375 | .remove = __devexit_p(ad5764_remove), | 375 | .remove = ad5764_remove, |
376 | .id_table = ad5764_ids, | 376 | .id_table = ad5764_ids, |
377 | }; | 377 | }; |
378 | module_spi_driver(ad5764_driver); | 378 | module_spi_driver(ad5764_driver); |
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c index 2bd2e37280ff..c84180f23139 100644 --- a/drivers/iio/dac/ad5791.c +++ b/drivers/iio/dac/ad5791.c | |||
@@ -346,7 +346,7 @@ static const struct iio_info ad5791_info = { | |||
346 | .driver_module = THIS_MODULE, | 346 | .driver_module = THIS_MODULE, |
347 | }; | 347 | }; |
348 | 348 | ||
349 | static int __devinit ad5791_probe(struct spi_device *spi) | 349 | static int ad5791_probe(struct spi_device *spi) |
350 | { | 350 | { |
351 | struct ad5791_platform_data *pdata = spi->dev.platform_data; | 351 | struct ad5791_platform_data *pdata = spi->dev.platform_data; |
352 | struct iio_dev *indio_dev; | 352 | struct iio_dev *indio_dev; |
@@ -439,7 +439,7 @@ error_ret: | |||
439 | return ret; | 439 | return ret; |
440 | } | 440 | } |
441 | 441 | ||
442 | static int __devexit ad5791_remove(struct spi_device *spi) | 442 | static int ad5791_remove(struct spi_device *spi) |
443 | { | 443 | { |
444 | struct iio_dev *indio_dev = spi_get_drvdata(spi); | 444 | struct iio_dev *indio_dev = spi_get_drvdata(spi); |
445 | struct ad5791_state *st = iio_priv(indio_dev); | 445 | struct ad5791_state *st = iio_priv(indio_dev); |
@@ -475,7 +475,7 @@ static struct spi_driver ad5791_driver = { | |||
475 | .owner = THIS_MODULE, | 475 | .owner = THIS_MODULE, |
476 | }, | 476 | }, |
477 | .probe = ad5791_probe, | 477 | .probe = ad5791_probe, |
478 | .remove = __devexit_p(ad5791_remove), | 478 | .remove = ad5791_remove, |
479 | .id_table = ad5791_id, | 479 | .id_table = ad5791_id, |
480 | }; | 480 | }; |
481 | module_spi_driver(ad5791_driver); | 481 | module_spi_driver(ad5791_driver); |
diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c index c3d748c25939..352abe2004a4 100644 --- a/drivers/iio/dac/max517.c +++ b/drivers/iio/dac/max517.c | |||
@@ -156,7 +156,7 @@ static const struct iio_chan_spec max517_channels[] = { | |||
156 | MAX517_CHANNEL(1) | 156 | MAX517_CHANNEL(1) |
157 | }; | 157 | }; |
158 | 158 | ||
159 | static int __devinit max517_probe(struct i2c_client *client, | 159 | static int max517_probe(struct i2c_client *client, |
160 | const struct i2c_device_id *id) | 160 | const struct i2c_device_id *id) |
161 | { | 161 | { |
162 | struct max517_data *data; | 162 | struct max517_data *data; |
@@ -210,7 +210,7 @@ exit: | |||
210 | return err; | 210 | return err; |
211 | } | 211 | } |
212 | 212 | ||
213 | static int __devexit max517_remove(struct i2c_client *client) | 213 | static int max517_remove(struct i2c_client *client) |
214 | { | 214 | { |
215 | iio_device_unregister(i2c_get_clientdata(client)); | 215 | iio_device_unregister(i2c_get_clientdata(client)); |
216 | iio_device_free(i2c_get_clientdata(client)); | 216 | iio_device_free(i2c_get_clientdata(client)); |
@@ -232,7 +232,7 @@ static struct i2c_driver max517_driver = { | |||
232 | .pm = MAX517_PM_OPS, | 232 | .pm = MAX517_PM_OPS, |
233 | }, | 233 | }, |
234 | .probe = max517_probe, | 234 | .probe = max517_probe, |
235 | .remove = __devexit_p(max517_remove), | 235 | .remove = max517_remove, |
236 | .id_table = max517_id, | 236 | .id_table = max517_id, |
237 | }; | 237 | }; |
238 | module_i2c_driver(max517_driver); | 238 | module_i2c_driver(max517_driver); |
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c index e0e168bd5b45..8f88cc4059a2 100644 --- a/drivers/iio/dac/mcp4725.c +++ b/drivers/iio/dac/mcp4725.c | |||
@@ -141,8 +141,8 @@ static const struct iio_info mcp4725_info = { | |||
141 | .driver_module = THIS_MODULE, | 141 | .driver_module = THIS_MODULE, |
142 | }; | 142 | }; |
143 | 143 | ||
144 | static int __devinit mcp4725_probe(struct i2c_client *client, | 144 | static int mcp4725_probe(struct i2c_client *client, |
145 | const struct i2c_device_id *id) | 145 | const struct i2c_device_id *id) |
146 | { | 146 | { |
147 | struct mcp4725_data *data; | 147 | struct mcp4725_data *data; |
148 | struct iio_dev *indio_dev; | 148 | struct iio_dev *indio_dev; |
@@ -195,7 +195,7 @@ exit: | |||
195 | return err; | 195 | return err; |
196 | } | 196 | } |
197 | 197 | ||
198 | static int __devexit mcp4725_remove(struct i2c_client *client) | 198 | static int mcp4725_remove(struct i2c_client *client) |
199 | { | 199 | { |
200 | struct iio_dev *indio_dev = i2c_get_clientdata(client); | 200 | struct iio_dev *indio_dev = i2c_get_clientdata(client); |
201 | 201 | ||
@@ -217,7 +217,7 @@ static struct i2c_driver mcp4725_driver = { | |||
217 | .pm = MCP4725_PM_OPS, | 217 | .pm = MCP4725_PM_OPS, |
218 | }, | 218 | }, |
219 | .probe = mcp4725_probe, | 219 | .probe = mcp4725_probe, |
220 | .remove = __devexit_p(mcp4725_remove), | 220 | .remove = mcp4725_remove, |
221 | .id_table = mcp4725_id, | 221 | .id_table = mcp4725_id, |
222 | }; | 222 | }; |
223 | module_i2c_driver(mcp4725_driver); | 223 | module_i2c_driver(mcp4725_driver); |