1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c
index 4d5dfe9c760a..5b954c19a6d2 100644
--- a/drivers/pinctrl/spear/pinctrl-spear310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear310.c
@@ -371,7 +371,7 @@ static struct spear_function *spear310_functions[] = {
         &tdm_function,
 };
 
-static struct of_device_id spear310_pinctrl_of_match[] __devinitdata = {
+static struct of_device_id spear310_pinctrl_of_match[] = {
         {
                 .compatible = "st,spear310-pinmux",
         },
@@ -400,7 +400,7 @@ static int __devinit spear310_pinctrl_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit spear310_pinctrl_remove(struct platform_device *pdev)
+static int spear310_pinctrl_remove(struct platform_device *pdev)
 {
         return spear_pinctrl_remove(pdev);
 }
@@ -412,7 +412,7 @@ static struct platform_driver spear310_pinctrl_driver = {
                 .of_match_table = spear310_pinctrl_of_match,
         },
         .probe = spear310_pinctrl_probe,
-        .remove = __devexit_p(spear310_pinctrl_remove),
+        .remove = spear310_pinctrl_remove,
 };
 
 static int __init spear310_pinctrl_init(void)