Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/upstream/kernel-adaptation-pc.git] / drivers / misc / ti_dac7512.c

diff --git a/drivers/misc/ti_dac7512.c b/drivers/misc/ti_dac7512.c
index 5acbba1..1d86407 100644 (file)
--- a/drivers/misc/ti_dac7512.c
+++ b/drivers/misc/ti_dac7512.c
@@ -54,7 +54,7 @@ static const struct attribute_group dac7512_attr_group = {
        .attrs = dac7512_attributes,
 };
 
-static int __devinit dac7512_probe(struct spi_device *spi)
+static int dac7512_probe(struct spi_device *spi)
 {
        int ret;
 
@@ -67,7 +67,7 @@ static int __devinit dac7512_probe(struct spi_device *spi)
        return sysfs_create_group(&spi->dev.kobj, &dac7512_attr_group);
 }
 
-static int __devexit dac7512_remove(struct spi_device *spi)
+static int dac7512_remove(struct spi_device *spi)
 {
        sysfs_remove_group(&spi->dev.kobj, &dac7512_attr_group);
        return 0;
@@ -79,7 +79,7 @@ static struct spi_driver dac7512_driver = {
                .owner  = THIS_MODULE,
        },
        .probe  = dac7512_probe,
-       .remove = __devexit_p(dac7512_remove),
+       .remove = dac7512_remove,
 };
 
 module_spi_driver(dac7512_driver);