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

[~andy/linux] / drivers / gpio / gpio-74x164.c

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index f05e54258ffb0a7c1b62eb54be11f2f8ed9486d8..464be961f605a70ff7db3c9845627ebf1f0abfad 100644 (file)
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -105,7 +105,7 @@ static int gen_74x164_direction_output(struct gpio_chip *gc,
        return 0;
 }
 
-static int __devinit gen_74x164_probe(struct spi_device *spi)
+static int gen_74x164_probe(struct spi_device *spi)
 {
        struct gen_74x164_chip *chip;
        struct gen_74x164_chip_platform_data *pdata;
@@ -181,7 +181,7 @@ exit_destroy:
        return ret;
 }
 
-static int __devexit gen_74x164_remove(struct spi_device *spi)
+static int gen_74x164_remove(struct spi_device *spi)
 {
        struct gen_74x164_chip *chip;
        int ret;
@@ -215,7 +215,7 @@ static struct spi_driver gen_74x164_driver = {
                .of_match_table = of_match_ptr(gen_74x164_dt_ids),
        },
        .probe          = gen_74x164_probe,
-       .remove         = __devexit_p(gen_74x164_remove),
+       .remove         = gen_74x164_remove,
 };
 module_spi_driver(gen_74x164_driver);