38 files changed, 38 insertions, 38 deletions

diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c
index 2dc5a6f3fd57..113aced64990 100644
--- a/drivers/mtd/devices/bcm47xxsflash.c
+++ b/drivers/mtd/devices/bcm47xxsflash.c
@@ -77,7 +77,7 @@ static int __devexit bcm47xxsflash_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver bcma_sflash_driver = {
-        .remove = __devexit_p(bcm47xxsflash_remove),
+        .remove = bcm47xxsflash_remove,
         .driver = {
                 .name = "bcma_sflash",
                 .owner = THIS_MODULE,
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 1518324611a2..bd2d91254c62 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -994,7 +994,7 @@ static struct spi_driver m25p80_driver = {
         },
         .id_table       = m25p_ids,
         .probe  = m25p_probe,
-        .remove = __devexit_p(m25p_remove),
+        .remove = m25p_remove,
 
         /* REVISIT: many of these chips have deep power-down modes, which
          * should clearly be entered on suspend() to minimize power use.
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 928fb0e6d73a..23ccc36840f6 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -920,7 +920,7 @@ static struct spi_driver dataflash_driver = {
         },
 
         .probe          = dataflash_probe,
-        .remove         = __devexit_p(dataflash_remove),
+        .remove         = dataflash_remove,
 
         /* FIXME:  investigate suspend and resume... */
 };
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 39e95673cdd2..e27737c91212 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -1092,7 +1092,7 @@ static struct platform_driver spear_smi_driver = {
 #endif
         },
         .probe = spear_smi_probe,
-        .remove = __devexit_p(spear_smi_remove),
+        .remove = spear_smi_remove,
 };
 module_platform_driver(spear_smi_driver);
 
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index ab8a2f4c8d60..9ebf86d8faa8 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -428,7 +428,7 @@ static struct spi_driver sst25l_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = sst25l_probe,
-        .remove         = __devexit_p(sst25l_remove),
+        .remove         = sst25l_remove,
 };
 
 module_spi_driver(sst25l_driver);
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index 76fb594bb1d9..ca0313db6fea 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -121,7 +121,7 @@ static struct platform_driver autcpu12_nvram_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = autcpu12_nvram_probe,
-        .remove         = __devexit_p(autcpu12_nvram_remove),
+        .remove         = autcpu12_nvram_remove,
 };
 module_platform_driver(autcpu12_nvram_driver);
 
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index ef5cde84a8b3..340e8a260547 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -184,7 +184,7 @@ static int __devexit bfin_flash_remove(struct platform_device *pdev)
 
 static struct platform_driver bfin_flash_driver = {
         .probe          = bfin_flash_probe,
-        .remove         = __devexit_p(bfin_flash_remove),
+        .remove         = bfin_flash_remove,
         .driver         = {
                 .name   = DRIVER_NAME,
         },
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index e4de96ba52b3..670af9afa786 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -273,7 +273,7 @@ static int __devexit gpio_flash_remove(struct platform_device *pdev)
 
 static struct platform_driver gpio_flash_driver = {
         .probe          = gpio_flash_probe,
-        .remove         = __devexit_p(gpio_flash_remove),
+        .remove         = gpio_flash_remove,
         .driver         = {
                 .name   = DRIVER_NAME,
         },
diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c
index 93f03175c82d..f6185d4c6ba9 100644
--- a/drivers/mtd/maps/intel_vr_nor.c
+++ b/drivers/mtd/maps/intel_vr_nor.c
@@ -256,7 +256,7 @@ vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 static struct pci_driver vr_nor_pci_driver = {
         .name = DRV_NAME,
         .probe = vr_nor_pci_probe,
-        .remove = __devexit_p(vr_nor_pci_remove),
+        .remove = vr_nor_pci_remove,
         .id_table = vr_nor_pci_ids,
 };
 
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index c03456f17004..4c032f168138 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -209,7 +209,7 @@ MODULE_DEVICE_TABLE(of, ltq_mtd_match);
 
 static struct platform_driver ltq_mtd_driver = {
         .probe = ltq_mtd_probe,
-        .remove = __devexit_p(ltq_mtd_remove),
+        .remove = ltq_mtd_remove,
         .driver = {
                 .name = "ltq-nor",
                 .owner = THIS_MODULE,
diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c
index 3c7ad17fca78..962a76a283a5 100644
--- a/drivers/mtd/maps/latch-addr-flash.c
+++ b/drivers/mtd/maps/latch-addr-flash.c
@@ -218,7 +218,7 @@ done:
 
 static struct platform_driver latch_addr_flash_driver = {
         .probe          = latch_addr_flash_probe,
-        .remove         = __devexit_p(latch_addr_flash_remove),
+        .remove         = latch_addr_flash_remove,
         .driver         = {
                 .name   = DRIVER_NAME,
         },
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index 1c30c1a307f4..ddc8c0c56d01 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -326,7 +326,7 @@ mtd_pci_remove(struct pci_dev *dev)
 static struct pci_driver mtd_pci_driver = {
         .name =         "MTD PCI",
         .probe =        mtd_pci_probe,
-        .remove =       __devexit_p(mtd_pci_remove),
+        .remove =       mtd_pci_remove,
         .id_table =     mtd_pci_ids,
 };
 
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index 65bd1cd4d627..9f4e5947c99f 100644
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -267,7 +267,7 @@ static struct i2c_driver pismo_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = pismo_probe,
-        .remove         = __devexit_p(pismo_remove),
+        .remove         = pismo_remove,
         .id_table       = pismo_id,
 };
 
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 81884c277405..f913a1c3f2b9 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -139,7 +139,7 @@ static struct platform_driver pxa2xx_flash_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = pxa2xx_flash_probe,
-        .remove         = __devexit_p(pxa2xx_flash_remove),
+        .remove         = pxa2xx_flash_remove,
         .shutdown       = pxa2xx_flash_shutdown,
 };
 
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c
index 9dcbc684abdb..d527608e5d22 100644
--- a/drivers/mtd/maps/scb2_flash.c
+++ b/drivers/mtd/maps/scb2_flash.c
@@ -231,7 +231,7 @@ static struct pci_driver scb2_flash_driver = {
         .name =     "Intel SCB2 BIOS Flash",
         .id_table = scb2_flash_pci_ids,
         .probe =    scb2_flash_probe,
-        .remove =   __devexit_p(scb2_flash_remove),
+        .remove =   scb2_flash_remove,
 };
 
 module_pci_driver(scb2_flash_driver);
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 175e537b444f..1c03ca7c4a74 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -155,7 +155,7 @@ static struct platform_driver uflash_driver = {
                 .of_match_table = uflash_match,
         },
         .probe          = uflash_probe,
-        .remove         = __devexit_p(uflash_remove),
+        .remove         = uflash_remove,
 };
 
 module_platform_driver(uflash_driver);
diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 2e2b0945edc7..5a83a264eb83 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -802,7 +802,7 @@ static struct maple_driver vmu_flash_driver = {
         .drv = {
                 .name =         "Dreamcast_visual_memory",
                 .probe =        probe_maple_vmu,
-                .remove =       __devexit_p(remove_maple_vmu),
+                .remove =       remove_maple_vmu,
         },
 };
 
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);
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index 1c4f97c63e62..27aa44a6ec26 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -112,7 +112,7 @@ static struct platform_driver generic_onenand_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = generic_onenand_probe,
-        .remove         = __devexit_p(generic_onenand_remove),
+        .remove         = generic_onenand_remove,
 };
 
 module_platform_driver(generic_onenand_driver);
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 1961be985171..73dac4c64a90 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -811,7 +811,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
 
 static struct platform_driver omap2_onenand_driver = {
         .probe          = omap2_onenand_probe,
-        .remove         = __devexit_p(omap2_onenand_remove),
+        .remove         = omap2_onenand_remove,
         .shutdown       = omap2_onenand_shutdown,
         .driver         = {
                 .name   = DRIVER_NAME,
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 8e4b3f2742ba..3d462cbcdbe4 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -1130,7 +1130,7 @@ static struct platform_driver s3c_onenand_driver = {
         },
         .id_table       = s3c_onenand_driver_ids,
         .probe          = s3c_onenand_probe,
-        .remove         = __devexit_p(s3c_onenand_remove),
+        .remove         = s3c_onenand_remove,
 };
 
 module_platform_driver(s3c_onenand_driver);