aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/dac/ad5064.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/iio/dac/ad5064.c')
-rw-r--r--drivers/iio/dac/ad5064.c18
1 files changed, 9 insertions, 9 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
427static int __devinit ad5064_probe(struct device *dev, enum ad5064_type type, 427static 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
498static int __devexit ad5064_remove(struct device *dev) 498static 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
526static int __devinit ad5064_spi_probe(struct spi_device *spi) 526static 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
534static int __devexit ad5064_spi_remove(struct spi_device *spi) 534static 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
599static int __devinit ad5064_i2c_probe(struct i2c_client *i2c, 599static 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
606static int __devexit ad5064_i2c_remove(struct i2c_client *i2c) 606static 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