Merge tag 'please-pull-vm_unwrapped' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / misc / ad525x_dpot-spi.c

diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c
index f62317540d002c9f2ce943537cb9f131e549ef7d..9da04ede04f356aaef1495bd0cf01408e6556da5 100644 (file)
--- a/drivers/misc/ad525x_dpot-spi.c
+++ b/drivers/misc/ad525x_dpot-spi.c
@@ -75,7 +75,7 @@ static const struct ad_dpot_bus_ops bops = {
        .write_r8d8     = write16,
        .write_r8d16    = write24,
 };
-static int __devinit ad_dpot_spi_probe(struct spi_device *spi)
+static int ad_dpot_spi_probe(struct spi_device *spi)
 {
        struct ad_dpot_bus_data bdata = {
                .client = spi,
@@ -87,7 +87,7 @@ static int __devinit ad_dpot_spi_probe(struct spi_device *spi)
                             spi_get_device_id(spi)->name);
 }
 
-static int __devexit ad_dpot_spi_remove(struct spi_device *spi)
+static int ad_dpot_spi_remove(struct spi_device *spi)
 {
        return ad_dpot_remove(&spi->dev);
 }
@@ -131,7 +131,7 @@ static struct spi_driver ad_dpot_spi_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = ad_dpot_spi_probe,
-       .remove         = __devexit_p(ad_dpot_spi_remove),
+       .remove         = ad_dpot_spi_remove,
        .id_table       = ad_dpot_spi_id,
 };