[MTD] [NAND] fsl_elbc_nand: fix section mismatch between probe and remove

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=aa83570e23e626fe8dd1253f17e6d175507025f1
Commit:     aa83570e23e626fe8dd1253f17e6d175507025f1
Parent:     4474573a90bae41351fad576fa80c424d62be567
Author:     Anton Vorontsov <avorontsov at ru.mvista.com>
AuthorDate: Fri Jun 6 18:59:40 2008 +0400
Committer:  David Woodhouse <dwmw2 at infradead.org>
CommitDate: Sat Jun 7 08:36:19 2008 +0100

    [MTD] [NAND] fsl_elbc_nand: fix section mismatch between probe and remove
    
    WARNING: drivers/mtd/nand/built-in.o(.devinit.text+0x114): Section mismatch
    in reference from the function fsl_elbc_ctrl_probe() to the function
    .devexit.text:fsl_elbc_ctrl_remove()
    
    __devinit functions should not call functions with __devexit. Since probe
    function calls remove in case of errors, we want to remove __devexit
    attribute from it.
    
    Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
    Acked-by: Scott Wood <scottwood at freescale.com>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
---
 drivers/mtd/nand/fsl_elbc_nand.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 4b69aac..1b06d29 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -917,7 +917,7 @@ static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl)
 	return 0;
 }
 
-static int __devexit fsl_elbc_ctrl_remove(struct of_device *ofdev)
+static int fsl_elbc_ctrl_remove(struct of_device *ofdev)
 {
 	struct fsl_elbc_ctrl *ctrl = dev_get_drvdata(&ofdev->dev);
 	int i;
@@ -1041,7 +1041,7 @@ static struct of_platform_driver fsl_elbc_ctrl_driver = {
 	},
 	.match_table = fsl_elbc_match,
 	.probe = fsl_elbc_ctrl_probe,
-	.remove = __devexit_p(fsl_elbc_ctrl_remove),
+	.remove = fsl_elbc_ctrl_remove,
 };
 
 static int __init fsl_elbc_init(void)