1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index a2b50c516b31..c7cf0b7a069b 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -287,7 +287,7 @@ static void spi_gpio_cleanup(struct spi_device *spi)
         spi_bitbang_cleanup(spi);
 }
 
-static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
+static int spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
 {
         int value;
 
@@ -301,9 +301,8 @@ static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
         return value;
 }
 
-static int __devinit
-spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label,
-        u16 *res_flags)
+static int spi_gpio_request(struct spi_gpio_platform_data *pdata,
+                            const char *label, u16 *res_flags)
 {
         int value;
 
@@ -392,7 +391,7 @@ static inline int spi_gpio_probe_dt(struct platform_device *pdev)
 }
 #endif
 
-static int __devinit spi_gpio_probe(struct platform_device *pdev)
+static int spi_gpio_probe(struct platform_device *pdev)
 {
         int                             status;
         struct spi_master               *master;
@@ -485,7 +484,7 @@ gpio_free:
         return status;
 }
 
-static int __devexit spi_gpio_remove(struct platform_device *pdev)
+static int spi_gpio_remove(struct platform_device *pdev)
 {
         struct spi_gpio                 *spi_gpio;
         struct spi_gpio_platform_data   *pdata;
@@ -518,7 +517,7 @@ static struct platform_driver spi_gpio_driver = {
                 .of_match_table = of_match_ptr(spi_gpio_dt_ids),
         },
         .probe          = spi_gpio_probe,
-        .remove         = __devexit_p(spi_gpio_remove),
+        .remove         = spi_gpio_remove,
 };
 module_platform_driver(spi_gpio_driver);