[PATCH] plat_nand: add missing __devexit_p()

[PATCH] plat_nand: add missing __devexit_p()

[Mike Frysinger]

The remove function uses __devexit, so the .remove assignment needs
__devexit_p() to fix a build error with hotplug disabled.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: linux-mtd@lists.infradead.org
---
 drivers/mtd/nand/plat_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 86e1d08..28ffd4e 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -128,7 +128,7 @@ static int __devexit plat_nand_remove(struct platform_device *pdev)
 
 static struct platform_driver plat_nand_driver = {
 	.probe		= plat_nand_probe,
-	.remove		= plat_nand_remove,
+	.remove		= __devexit_p(plat_nand_remove),
 	.driver		= {
 		.name	= "gen_nand",
 		.owner	= THIS_MODULE,
-- 
1.6.3

Re: [PATCH] plat_nand: add missing __devexit_p()

[Artem Bityutskiy]

On Mon, 2009-05-18 at 04:08 -0400, Mike Frysinger wrote:
> The remove function uses __devexit, so the .remove assignment needs
> __devexit_p() to fix a build error with hotplug disabled.

I already have a patch for this in my l2-mtd-2.6.git tree:

commit 486dd2676fd0dc0f944ce142a57cda8772eec118
Author: Thomas Chou <thomas@wytron.com.tw>
Date:   Tue Apr 21 12:27:34 2009 +0800

    MTD: plat_nand: fix section error

    With CONFIG_HOTPLUG=n, the following eror occurred during link:
    local symbol 0: discarded in section `.devexit.text' from
    drivers/built-in.o

    It was caused by improper section reference. The __devexit_p()
    should be added to the .remove function.

    Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 86e1d08..28ffd4e 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -128,7 +128,7 @@ static int __devexit plat_nand_remove(struct
platform_device *pdev)

 static struct platform_driver plat_nand_driver = {
        .probe          = plat_nand_probe,
-       .remove         = plat_nand_remove,
+       .remove         = __devexit_p(plat_nand_remove),
        .driver         = {
                .name   = "gen_nand",
                .owner  = THIS_MODULE,

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)