aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/dac/ad5380.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/iio/dac/ad5380.c')
-rw-r--r--drivers/iio/dac/ad5380.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index 4aca1895ce52..483fc379a2da 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
341static int __devinit ad5380_alloc_channels(struct iio_dev *indio_dev) 341static 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
364static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap, 364static 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;
@@ -445,7 +445,7 @@ error_out:
445 return ret; 445 return ret;
446} 446}
447 447
448static int __devexit ad5380_remove(struct device *dev) 448static int ad5380_remove(struct device *dev)
449{ 449{
450 struct iio_dev *indio_dev = dev_get_drvdata(dev); 450 struct iio_dev *indio_dev = dev_get_drvdata(dev);
451 struct ad5380_state *st = iio_priv(indio_dev); 451 struct ad5380_state *st = iio_priv(indio_dev);
@@ -482,7 +482,7 @@ static const struct regmap_config ad5380_regmap_config = {
482 482
483#if IS_ENABLED(CONFIG_SPI_MASTER) 483#if IS_ENABLED(CONFIG_SPI_MASTER)
484 484
485static int __devinit ad5380_spi_probe(struct spi_device *spi) 485static int ad5380_spi_probe(struct spi_device *spi)
486{ 486{
487 const struct spi_device_id *id = spi_get_device_id(spi); 487 const struct spi_device_id *id = spi_get_device_id(spi);
488 struct regmap *regmap; 488 struct regmap *regmap;
@@ -495,7 +495,7 @@ static int __devinit ad5380_spi_probe(struct spi_device *spi)
495 return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name); 495 return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name);
496} 496}
497 497
498static int __devexit ad5380_spi_remove(struct spi_device *spi) 498static int ad5380_spi_remove(struct spi_device *spi)
499{ 499{
500 return ad5380_remove(&spi->dev); 500 return ad5380_remove(&spi->dev);
501} 501}
@@ -527,7 +527,7 @@ static struct spi_driver ad5380_spi_driver = {
527 .owner = THIS_MODULE, 527 .owner = THIS_MODULE,
528 }, 528 },
529 .probe = ad5380_spi_probe, 529 .probe = ad5380_spi_probe,
530 .remove = __devexit_p(ad5380_spi_remove), 530 .remove = ad5380_spi_remove,
531 .id_table = ad5380_spi_ids, 531 .id_table = ad5380_spi_ids,
532}; 532};
533 533
@@ -556,8 +556,8 @@ static inline void ad5380_spi_unregister_driver(void)
556 556
557#if IS_ENABLED(CONFIG_I2C) 557#if IS_ENABLED(CONFIG_I2C)
558 558
559static int __devinit ad5380_i2c_probe(struct i2c_client *i2c, 559static int ad5380_i2c_probe(struct i2c_client *i2c,
560 const struct i2c_device_id *id) 560 const struct i2c_device_id *id)
561{ 561{
562 struct regmap *regmap; 562 struct regmap *regmap;
563 563
@@ -569,7 +569,7 @@ static int __devinit ad5380_i2c_probe(struct i2c_client *i2c,
569 return ad5380_probe(&i2c->dev, regmap, id->driver_data, id->name); 569 return ad5380_probe(&i2c->dev, regmap, id->driver_data, id->name);
570} 570}
571 571
572static int __devexit ad5380_i2c_remove(struct i2c_client *i2c) 572static int ad5380_i2c_remove(struct i2c_client *i2c)
573{ 573{
574 return ad5380_remove(&i2c->dev); 574 return ad5380_remove(&i2c->dev);
575} 575}
@@ -601,7 +601,7 @@ static struct i2c_driver ad5380_i2c_driver = {
601 .owner = THIS_MODULE, 601 .owner = THIS_MODULE,
602 }, 602 },
603 .probe = ad5380_i2c_probe, 603 .probe = ad5380_i2c_probe,
604 .remove = __devexit_p(ad5380_i2c_remove), 604 .remove = ad5380_i2c_remove,
605 .id_table = ad5380_i2c_ids, 605 .id_table = ad5380_i2c_ids,
606}; 606};
607 607