mtd: sst25l: fix section markings
authorMike Frysinger <vapier@gentoo.org>
Mon, 9 May 2011 14:07:58 +0000 (10:07 -0400)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 25 May 2011 01:02:57 +0000 (02:02 +0100)
The previous section mismatch fix for this driver wasn't entirely correct.
The sst25l_flash_info array is now used in the devinit probe func, but is
marked as initdata, so building results in the warning:

WARNING: drivers/mtd/devices/sst25l.o(.devinit.text): Section mismatch
in reference from the function sst25l_probe()
to the variable .init.data:sst25l_flash_info

Further, the remove func should be devexit rather than exit to match the
probe func.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/devices/sst25l.c

index c163e619abc90647d38b45ba0e9799931c1abdd5..ac1d2442e101ef5cec7fe3f8adf10d67935d5501 100644 (file)
@@ -66,7 +66,7 @@ struct flash_info {
 
 #define to_sst25l_flash(x) container_of(x, struct sst25l_flash, mtd)
 
-static struct flash_info __initdata sst25l_flash_info[] = {
+static struct flash_info __devinitdata sst25l_flash_info[] = {
        {"sst25lf020a", 0xbf43, 256, 1024, 4096},
        {"sst25lf040a", 0xbf44, 256, 2048, 4096},
 };
@@ -469,7 +469,7 @@ static int __devinit sst25l_probe(struct spi_device *spi)
        return 0;
 }
 
-static int __exit sst25l_remove(struct spi_device *spi)
+static int __devexit sst25l_remove(struct spi_device *spi)
 {
        struct sst25l_flash *flash = dev_get_drvdata(&spi->dev);
        int ret;
@@ -490,7 +490,7 @@ static struct spi_driver sst25l_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = sst25l_probe,
-       .remove         = __exit_p(sst25l_remove),
+       .remove         = __devexit_p(sst25l_remove),
 };
 
 static int __init sst25l_init(void)