18 files changed, 18 insertions, 18 deletions

diff --git a/drivers/pinctrl/pinctrl-imx23.c b/drivers/pinctrl/pinctrl-imx23.c
index 3674d877ed7c..67e1b3bb70da 100644
--- a/drivers/pinctrl/pinctrl-imx23.c
+++ b/drivers/pinctrl/pinctrl-imx23.c
@@ -285,7 +285,7 @@ static struct platform_driver imx23_pinctrl_driver = {
                 .of_match_table = imx23_pinctrl_of_match,
         },
         .probe = imx23_pinctrl_probe,
-        .remove = __devexit_p(mxs_pinctrl_remove),
+        .remove = mxs_pinctrl_remove,
 };
 
 static int __init imx23_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-imx28.c b/drivers/pinctrl/pinctrl-imx28.c
index 0f5b2122b1ba..feeb4b9f802a 100644
--- a/drivers/pinctrl/pinctrl-imx28.c
+++ b/drivers/pinctrl/pinctrl-imx28.c
@@ -401,7 +401,7 @@ static struct platform_driver imx28_pinctrl_driver = {
                 .of_match_table = imx28_pinctrl_of_match,
         },
         .probe = imx28_pinctrl_probe,
-        .remove = __devexit_p(mxs_pinctrl_remove),
+        .remove = mxs_pinctrl_remove,
 };
 
 static int __init imx28_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-imx35.c b/drivers/pinctrl/pinctrl-imx35.c
index 82f109e26f27..a88d087ac0dd 100644
--- a/drivers/pinctrl/pinctrl-imx35.c
+++ b/drivers/pinctrl/pinctrl-imx35.c
@@ -1576,7 +1576,7 @@ static struct platform_driver imx35_pinctrl_driver = {
                 .of_match_table = of_match_ptr(imx35_pinctrl_of_match),
         },
         .probe = imx35_pinctrl_probe,
-        .remove = __devexit_p(imx_pinctrl_remove),
+        .remove = imx_pinctrl_remove,
 };
 
 static int __init imx35_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-imx51.c b/drivers/pinctrl/pinctrl-imx51.c
index fb8468966779..5c489487a054 100644
--- a/drivers/pinctrl/pinctrl-imx51.c
+++ b/drivers/pinctrl/pinctrl-imx51.c
@@ -1303,7 +1303,7 @@ static struct platform_driver imx51_pinctrl_driver = {
                 .of_match_table = of_match_ptr(imx51_pinctrl_of_match),
         },
         .probe = imx51_pinctrl_probe,
-        .remove = __devexit_p(imx_pinctrl_remove),
+        .remove = imx_pinctrl_remove,
 };
 
 static int __init imx51_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-imx53.c b/drivers/pinctrl/pinctrl-imx53.c
index 783feb1ce064..8e5c15f70895 100644
--- a/drivers/pinctrl/pinctrl-imx53.c
+++ b/drivers/pinctrl/pinctrl-imx53.c
@@ -1630,7 +1630,7 @@ static struct platform_driver imx53_pinctrl_driver = {
                 .of_match_table = of_match_ptr(imx53_pinctrl_of_match),
         },
         .probe = imx53_pinctrl_probe,
-        .remove = __devexit_p(imx_pinctrl_remove),
+        .remove = imx_pinctrl_remove,
 };
 
 static int __init imx53_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-imx6q.c b/drivers/pinctrl/pinctrl-imx6q.c
index e9bf71fbedca..831dae675330 100644
--- a/drivers/pinctrl/pinctrl-imx6q.c
+++ b/drivers/pinctrl/pinctrl-imx6q.c
@@ -2314,7 +2314,7 @@ static struct platform_driver imx6q_pinctrl_driver = {
                 .of_match_table = of_match_ptr(imx6q_pinctrl_of_match),
         },
         .probe = imx6q_pinctrl_probe,
-        .remove = __devexit_p(imx_pinctrl_remove),
+        .remove = imx_pinctrl_remove,
 };
 
 static int __init imx6q_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-mmp2.c b/drivers/pinctrl/pinctrl-mmp2.c
index 2cfed552bbe4..a5159a3d67d2 100644
--- a/drivers/pinctrl/pinctrl-mmp2.c
+++ b/drivers/pinctrl/pinctrl-mmp2.c
@@ -702,7 +702,7 @@ static struct platform_driver mmp2_pinmux_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = mmp2_pinmux_probe,
-        .remove = __devexit_p(mmp2_pinmux_remove),
+        .remove = mmp2_pinmux_remove,
 };
 
 static int __init mmp2_pinmux_init(void)
diff --git a/drivers/pinctrl/pinctrl-pxa168.c b/drivers/pinctrl/pinctrl-pxa168.c
index c1997fa7f28c..4abab7858309 100644
--- a/drivers/pinctrl/pinctrl-pxa168.c
+++ b/drivers/pinctrl/pinctrl-pxa168.c
@@ -631,7 +631,7 @@ static struct platform_driver pxa168_pinmux_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = pxa168_pinmux_probe,
-        .remove = __devexit_p(pxa168_pinmux_remove),
+        .remove = pxa168_pinmux_remove,
 };
 
 static int __init pxa168_pinmux_init(void)
diff --git a/drivers/pinctrl/pinctrl-pxa910.c b/drivers/pinctrl/pinctrl-pxa910.c
index c72ab4b9cc8c..ee2c861b734c 100644
--- a/drivers/pinctrl/pinctrl-pxa910.c
+++ b/drivers/pinctrl/pinctrl-pxa910.c
@@ -987,7 +987,7 @@ static struct platform_driver pxa910_pinmux_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = pxa910_pinmux_probe,
-        .remove = __devexit_p(pxa910_pinmux_remove),
+        .remove = pxa910_pinmux_remove,
 };
 
 static int __init pxa910_pinmux_init(void)
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 726a729a2ec9..a0d9584a08f7 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1006,7 +1006,7 @@ MODULE_DEVICE_TABLE(of, pcs_of_match);
 
 static struct platform_driver pcs_driver = {
         .probe          = pcs_probe,
-        .remove         = __devexit_p(pcs_remove),
+        .remove         = pcs_remove,
         .driver = {
                 .owner          = THIS_MODULE,
                 .name           = DRIVER_NAME,
diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c
index a74f9a568536..e749dedd8edb 100644
--- a/drivers/pinctrl/pinctrl-tegra20.c
+++ b/drivers/pinctrl/pinctrl-tegra20.c
@@ -2873,7 +2873,7 @@ static struct platform_driver tegra20_pinctrl_driver = {
                 .of_match_table = tegra20_pinctrl_of_match,
         },
         .probe = tegra20_pinctrl_probe,
-        .remove = __devexit_p(tegra_pinctrl_remove),
+        .remove = tegra_pinctrl_remove,
 };
 
 static int __init tegra20_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c
index 7894f14c7059..dc1e229b05fd 100644
--- a/drivers/pinctrl/pinctrl-tegra30.c
+++ b/drivers/pinctrl/pinctrl-tegra30.c
@@ -3739,7 +3739,7 @@ static struct platform_driver tegra30_pinctrl_driver = {
                 .of_match_table = tegra30_pinctrl_of_match,
         },
         .probe = tegra30_pinctrl_probe,
-        .remove = __devexit_p(tegra_pinctrl_remove),
+        .remove = tegra_pinctrl_remove,
 };
 
 static int __init tegra30_pinctrl_init(void)
diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c
index 309f5b9a70ec..62a739dc655e 100644
--- a/drivers/pinctrl/pinctrl-u300.c
+++ b/drivers/pinctrl/pinctrl-u300.c
@@ -1184,7 +1184,7 @@ static struct platform_driver u300_pmx_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = u300_pmx_probe,
-        .remove = __devexit_p(u300_pmx_remove),
+        .remove = u300_pmx_remove,
 };
 
 static int __init u300_pmx_init(void)
diff --git a/drivers/pinctrl/spear/pinctrl-spear1310.c b/drivers/pinctrl/spear/pinctrl-spear1310.c
index 0436fc7895d6..c256777bb957 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1310.c
@@ -2452,7 +2452,7 @@ static struct platform_driver spear1310_pinctrl_driver = {
                 .of_match_table = spear1310_pinctrl_of_match,
         },
         .probe = spear1310_pinctrl_probe,
-        .remove = __devexit_p(spear1310_pinctrl_remove),
+        .remove = spear1310_pinctrl_remove,
 };
 
 static int __init spear1310_pinctrl_init(void)
diff --git a/drivers/pinctrl/spear/pinctrl-spear1340.c b/drivers/pinctrl/spear/pinctrl-spear1340.c
index 0606b8cf3f2c..b9f72948c05d 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1340.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1340.c
@@ -2005,7 +2005,7 @@ static struct platform_driver spear1340_pinctrl_driver = {
                 .of_match_table = spear1340_pinctrl_of_match,
         },
         .probe = spear1340_pinctrl_probe,
-        .remove = __devexit_p(spear1340_pinctrl_remove),
+        .remove = spear1340_pinctrl_remove,
 };
 
 static int __init spear1340_pinctrl_init(void)
diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c
index 4dfc2849b172..55fddb2c5a6e 100644
--- a/drivers/pinctrl/spear/pinctrl-spear300.c
+++ b/drivers/pinctrl/spear/pinctrl-spear300.c
@@ -687,7 +687,7 @@ static struct platform_driver spear300_pinctrl_driver = {
                 .of_match_table = spear300_pinctrl_of_match,
         },
         .probe = spear300_pinctrl_probe,
-        .remove = __devexit_p(spear300_pinctrl_remove),
+        .remove = spear300_pinctrl_remove,
 };
 
 static int __init spear300_pinctrl_init(void)
diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c
index 96883693fb7e..53b27ca5f22d 100644
--- a/drivers/pinctrl/spear/pinctrl-spear310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear310.c
@@ -410,7 +410,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)
diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c
index ca47b0e50780..92df44e6eb39 100644
--- a/drivers/pinctrl/spear/pinctrl-spear320.c
+++ b/drivers/pinctrl/spear/pinctrl-spear320.c
@@ -3451,7 +3451,7 @@ static struct platform_driver spear320_pinctrl_driver = {
                 .of_match_table = spear320_pinctrl_of_match,
         },
         .probe = spear320_pinctrl_probe,
-        .remove = __devexit_p(spear320_pinctrl_remove),
+        .remove = spear320_pinctrl_remove,
 };
 
 static int __init spear320_pinctrl_init(void)