mtd: remove use of __devexit_p

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

18 files changed, 18 insertions, 18 deletions

diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 9e7723aa7acc..51dba43e2879 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -289,7 +289,7 @@ static int __devexit ams_delta_cleanup(struct platform_device *pdev)
 
 static struct platform_driver ams_delta_nand_driver = {
         .probe          = ams_delta_init,
-        .remove         = __devexit_p(ams_delta_cleanup),
+        .remove         = ams_delta_cleanup,
         .driver         = {
                 .name   = "ams-delta-nand",
                 .owner  = THIS_MODULE,
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 5c47b200045a..d84af46ccc8d 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -509,7 +509,7 @@ static struct platform_driver au1550nd_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = au1550nd_probe,
-        .remove         = __devexit_p(au1550nd_remove),
+        .remove         = au1550nd_remove,
 };
 
 module_platform_driver(au1550nd_driver);
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index ab0caa74eb43..0afd4ac34248 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -865,7 +865,7 @@ static int bf5xx_nand_resume(struct platform_device *dev)
 /* driver device registration */
 static struct platform_driver bf5xx_nand_driver = {
         .probe          = bf5xx_nand_probe,
-        .remove         = __devexit_p(bf5xx_nand_remove),
+        .remove         = bf5xx_nand_remove,
         .suspend        = bf5xx_nand_suspend,
         .resume         = bf5xx_nand_resume,
         .driver         = {
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 2bb7170502c2..1b62f043bf7e 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -887,7 +887,7 @@ static struct pci_driver cafe_nand_pci_driver = {
         .name = "CAFÉ NAND",
         .id_table = cafe_nand_tbl,
         .probe = cafe_nand_probe,
-        .remove = __devexit_p(cafe_nand_remove),
+        .remove = cafe_nand_remove,
         .resume = cafe_nand_resume,
 };
 
diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c
index fbabbaa04374..445de7c8bb50 100644
--- a/drivers/mtd/nand/denali_dt.c
+++ b/drivers/mtd/nand/denali_dt.c
@@ -142,7 +142,7 @@ static int __devexit denali_dt_remove(struct platform_device *ofdev)
 
 static struct platform_driver denali_dt_driver = {
         .probe          = denali_dt_probe,
-        .remove         = __devexit_p(denali_dt_remove),
+        .remove         = denali_dt_remove,
         .driver         = {
                 .name   = "denali-nand-dt",
                 .owner  = THIS_MODULE,
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 45df542b9c61..b40661d7160e 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -350,7 +350,7 @@ static struct platform_driver of_fun_driver = {
                 .of_match_table = of_fun_match,
         },
         .probe          = fun_probe,
-        .remove         = __devexit_p(fun_remove),
+        .remove         = fun_remove,
 };
 
 module_platform_driver(of_fun_driver);
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index d37619882fa6..7ce6d01a3c94 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1692,7 +1692,7 @@ static struct platform_driver gpmi_nand_driver = {
                 .of_match_table = gpmi_nand_id_table,
         },
         .probe   = gpmi_nand_probe,
-        .remove  = __devexit_p(gpmi_nand_remove),
+        .remove  = gpmi_nand_remove,
         .id_table = gpmi_ids,
 };
 module_platform_driver(gpmi_nand_driver);
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 100b6775e175..2552fe28d050 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -573,7 +573,7 @@ static int __devexit jz_nand_remove(struct platform_device *pdev)
 
 static struct platform_driver jz_nand_driver = {
         .probe = jz_nand_probe,
-        .remove = __devexit_p(jz_nand_remove),
+        .remove = jz_nand_remove,
         .driver = {
                 .name = "jz4740-nand",
                 .owner = THIS_MODULE,
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index c29b7ac1f6af..311564259d28 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -907,7 +907,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_nand_match);
 
 static struct platform_driver lpc32xx_nand_driver = {
         .probe          = lpc32xx_nand_probe,
-        .remove         = __devexit_p(lpc32xx_nand_remove),
+        .remove         = lpc32xx_nand_remove,
         .resume         = lpc32xx_nand_resume,
         .suspend        = lpc32xx_nand_suspend,
         .driver         = {
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 32409c45d479..9e291b71a8cc 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -1021,7 +1021,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_nand_match);
 
 static struct platform_driver lpc32xx_nand_driver = {
         .probe          = lpc32xx_nand_probe,
-        .remove         = __devexit_p(lpc32xx_nand_remove),
+        .remove         = lpc32xx_nand_remove,
         .resume         = lpc32xx_nand_resume,
         .suspend        = lpc32xx_nand_suspend,
         .driver         = {
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index f776c8577b8c..17fe0c942fb0 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -848,7 +848,7 @@ static struct of_device_id mpc5121_nfc_match[] __devinitdata = {
 
 static struct platform_driver mpc5121_nfc_driver = {
         .probe          = mpc5121_nfc_probe,
-        .remove         = __devexit_p(mpc5121_nfc_remove),
+        .remove         = mpc5121_nfc_remove,
         .driver         = {
                 .name = DRV_NAME,
                 .owner = THIS_MODULE,
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 72e31d86030d..a4caf640a307 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1556,7 +1556,7 @@ static struct platform_driver mxcnd_driver = {
                    .of_match_table = of_match_ptr(mxcnd_dt_ids),
         },
         .probe = mxcnd_probe,
-        .remove = __devexit_p(mxcnd_remove),
+        .remove = mxcnd_remove,
 };
 module_platform_driver(mxcnd_driver);
 
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 5fd3f010e3ae..32e6bef480dc 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -279,7 +279,7 @@ static struct platform_driver ndfc_driver = {
                 .of_match_table = ndfc_match,
         },
         .probe = ndfc_probe,
-        .remove = __devexit_p(ndfc_remove),
+        .remove = ndfc_remove,
 };
 
 module_platform_driver(ndfc_driver);
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 94dc46bc118c..eed134c55326 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -340,7 +340,7 @@ static int __devexit nuc900_nand_remove(struct platform_device *pdev)
 
 static struct platform_driver nuc900_nand_driver = {
         .probe          = nuc900_nand_probe,
-        .remove         = __devexit_p(nuc900_nand_remove),
+        .remove         = nuc900_nand_remove,
         .driver         = {
                 .name   = "nuc900-fmi",
                 .owner  = THIS_MODULE,
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index aefaf8cd31ef..e6b296dcb122 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -223,7 +223,7 @@ static struct of_device_id orion_nand_of_match_table[] = {
 #endif
 
 static struct platform_driver orion_nand_driver = {
-        .remove         = __devexit_p(orion_nand_remove),
+        .remove         = orion_nand_remove,
         .driver         = {
                 .name   = "orion_nand",
                 .owner  = THIS_MODULE,
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index a47ee68a0cfa..95a1dba150d2 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -160,7 +160,7 @@ MODULE_DEVICE_TABLE(of, plat_nand_match);
 
 static struct platform_driver plat_nand_driver = {
         .probe  = plat_nand_probe,
-        .remove = __devexit_p(plat_nand_remove),
+        .remove = plat_nand_remove,
         .driver = {
                 .name           = "gen_nand",
                 .owner          = THIS_MODULE,
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 3421e3762a5a..541fd5117625 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -228,7 +228,7 @@ static struct platform_driver sharpsl_nand_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = sharpsl_nand_probe,
-        .remove         = __devexit_p(sharpsl_nand_remove),
+        .remove         = sharpsl_nand_remove,
 };
 
 module_platform_driver(sharpsl_nand_driver);
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index f3f28fafbf7a..78b1a040b88a 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -251,7 +251,7 @@ static struct platform_driver socrates_nand_driver = {
                 .of_match_table = socrates_nand_match,
         },
         .probe          = socrates_nand_probe,
-        .remove         = __devexit_p(socrates_nand_remove),
+        .remove         = socrates_nand_remove,
 };
 
 module_platform_driver(socrates_nand_driver);