Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / staging / iio / gyro / adis16260_core.c

diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index b988b4f5bdda7be7e3c7a4f8856d976ba6e7dbb5..6e80b8c768ae0075b6627e9383d080c09cf3f74d 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -301,7 +301,7 @@ static const struct adis_data adis16260_data = {
                BIT(ADIS16260_DIAG_STAT_POWER_LOW_BIT),
 };
 
-static int __devinit adis16260_probe(struct spi_device *spi)
+static int adis16260_probe(struct spi_device *spi)
 {
        int ret;
        struct adis16260_platform_data *pd = spi->dev.platform_data;
@@ -384,7 +384,7 @@ error_ret:
        return ret;
 }
 
-static int __devexit adis16260_remove(struct spi_device *spi)
+static int adis16260_remove(struct spi_device *spi)
 {
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
        struct adis16260_state *st = iio_priv(indio_dev);
@@ -417,7 +417,7 @@ static struct spi_driver adis16260_driver = {
                .owner = THIS_MODULE,
        },
        .probe = adis16260_probe,
-       .remove = __devexit_p(adis16260_remove),
+       .remove = adis16260_remove,
        .id_table = adis16260_id,
 };
 module_spi_driver(adis16260_driver);