Merge tag 'msm-fix-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / nand / nuc900_nand.c

diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 94dc46bc118cf7afac5608a9b3f2483b5719fd6c..a6191198d259f02b4f1b14e6437eec5d71ea9a30 100644 (file)
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -246,7 +246,7 @@ static void nuc900_nand_enable(struct nuc900_nand *nand)
        spin_unlock(&nand->lock);
 }
 
-static int __devinit nuc900_nand_probe(struct platform_device *pdev)
+static int nuc900_nand_probe(struct platform_device *pdev)
 {
        struct nuc900_nand *nuc900_nand;
        struct nand_chip *chip;
@@ -317,7 +317,7 @@ fail1:      kfree(nuc900_nand);
        return retval;
 }
 
-static int __devexit nuc900_nand_remove(struct platform_device *pdev)
+static int nuc900_nand_remove(struct platform_device *pdev)
 {
        struct nuc900_nand *nuc900_nand = platform_get_drvdata(pdev);
        struct resource *res;
@@ -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,