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

[~andy/linux] / drivers / misc / eeprom / eeprom_93xx46.c

diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index ce3fe3633dd771c724be75870d6712f16971e96c..a6b5d5e73485cc5a83ee6ae8c8d5257019dc3d2e 100644 (file)
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -309,7 +309,7 @@ static ssize_t eeprom_93xx46_store_erase(struct device *dev,
 }
 static DEVICE_ATTR(erase, S_IWUSR, NULL, eeprom_93xx46_store_erase);
 
-static int __devinit eeprom_93xx46_probe(struct spi_device *spi)
+static int eeprom_93xx46_probe(struct spi_device *spi)
 {
        struct eeprom_93xx46_platform_data *pd;
        struct eeprom_93xx46_dev *edev;
@@ -370,7 +370,7 @@ fail:
        return err;
 }
 
-static int __devexit eeprom_93xx46_remove(struct spi_device *spi)
+static int eeprom_93xx46_remove(struct spi_device *spi)
 {
        struct eeprom_93xx46_dev *edev = dev_get_drvdata(&spi->dev);
 
@@ -389,7 +389,7 @@ static struct spi_driver eeprom_93xx46_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = eeprom_93xx46_probe,
-       .remove         = __devexit_p(eeprom_93xx46_remove),
+       .remove         = eeprom_93xx46_remove,
 };
 
 module_spi_driver(eeprom_93xx46_driver);