Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore

[cascardo/linux.git] / drivers / spi / spidev.c

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index e44abc9..2e0655d 100644 (file)
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -573,7 +573,7 @@ static struct class *spidev_class;
 
 /*-------------------------------------------------------------------------*/
 
-static int __devinit spidev_probe(struct spi_device *spi)
+static int spidev_probe(struct spi_device *spi)
 {
        struct spidev_data      *spidev;
        int                     status;
@@ -622,7 +622,7 @@ static int __devinit spidev_probe(struct spi_device *spi)
        return status;
 }
 
-static int __devexit spidev_remove(struct spi_device *spi)
+static int spidev_remove(struct spi_device *spi)
 {
        struct spidev_data      *spidev = spi_get_drvdata(spi);
 
@@ -658,7 +658,7 @@ static struct spi_driver spidev_spi_driver = {
                .of_match_table = of_match_ptr(spidev_dt_ids),
        },
        .probe =        spidev_probe,
-       .remove =       __devexit_p(spidev_remove),
+       .remove =       spidev_remove,
 
        /* NOTE:  suspend/resume methods are not necessary here.
         * We don't do anything except pass the requests to/from