diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 13:54:50 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 13:54:50 +0100 |
commit | cead4dbc03ba6eb2e35bac04439b76a0cc2286ce (patch) | |
tree | 7563bdedb51b496ee57f5f1b7141305d59dcddf1 | |
parent | ce589a0328866228412ea0df2c834688da8f4700 (diff) | |
download | linux-stable-cead4dbc03ba6eb2e35bac04439b76a0cc2286ce.tar.gz linux-stable-cead4dbc03ba6eb2e35bac04439b76a0cc2286ce.tar.bz2 linux-stable-cead4dbc03ba6eb2e35bac04439b76a0cc2286ce.zip |
[MTD NAND] Make various initfuncs static, remove #ifdef MODULE from exitfuncs
We all inherited the same error from the original NAND board driver which
got copied and changed. Fix them all at once...
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r-- | drivers/mtd/nand/au1550nd.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/autcpu12.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/cs553x_nand.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/rtc_from4.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/sharpsl.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/spia.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/toto.c | 2 |
7 files changed, 7 insertions, 17 deletions
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c index 87d34351a86d..861fb961d942 100644 --- a/drivers/mtd/nand/au1550nd.c +++ b/drivers/mtd/nand/au1550nd.c @@ -321,7 +321,7 @@ int au1550_device_ready(struct mtd_info *mtd) /* * Main initialization routine */ -int __init au1xxx_nand_init(void) +static int __init au1xxx_nand_init(void) { struct nand_chip *this; u16 boot_swapboot = 0; /* default value */ @@ -480,7 +480,6 @@ module_init(au1xxx_nand_init); /* * Clean up routine */ -#ifdef MODULE static void __exit au1550_cleanup(void) { struct nand_chip *this = (struct nand_chip *)&au1550_mtd[1]; @@ -496,7 +495,6 @@ static void __exit au1550_cleanup(void) } module_exit(au1550_cleanup); -#endif MODULE_LICENSE("GPL"); MODULE_AUTHOR("Embedded Edge, LLC"); diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c index 330deb032217..43b296040d7f 100644 --- a/drivers/mtd/nand/autcpu12.c +++ b/drivers/mtd/nand/autcpu12.c @@ -124,7 +124,7 @@ int autcpu12_device_ready(struct mtd_info *mtd) /* * Main initialization routine */ -int __init autcpu12_init(void) +static int __init autcpu12_init(void) { struct nand_chip *this; int err = 0; @@ -203,7 +203,6 @@ module_init(autcpu12_init); /* * Clean up routine */ -#ifdef MODULE static void __exit autcpu12_cleanup(void) { /* Release resources, unregister device */ @@ -217,7 +216,6 @@ static void __exit autcpu12_cleanup(void) } module_exit(autcpu12_cleanup); -#endif MODULE_LICENSE("GPL"); MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>"); diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c index d5b05514bb8b..bf251253ea1f 100644 --- a/drivers/mtd/nand/cs553x_nand.c +++ b/drivers/mtd/nand/cs553x_nand.c @@ -267,7 +267,7 @@ out: return err; } -int __init cs553x_init(void) +static int __init cs553x_init(void) { int err = -ENXIO; int i; diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c index 0c56a6629128..bc9d849fbd5d 100644 --- a/drivers/mtd/nand/rtc_from4.c +++ b/drivers/mtd/nand/rtc_from4.c @@ -516,7 +516,7 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, int s /* * Main initialization routine */ -int __init rtc_from4_init(void) +static int __init rtc_from4_init(void) { struct nand_chip *this; unsigned short bcr1, bcr2, wcr2; @@ -637,7 +637,6 @@ module_init(rtc_from4_init); /* * Clean up routine */ -#ifdef MODULE static void __exit rtc_from4_cleanup(void) { /* Release resource, unregister partitions */ @@ -655,7 +654,6 @@ static void __exit rtc_from4_cleanup(void) } module_exit(rtc_from4_cleanup); -#endif MODULE_LICENSE("GPL"); MODULE_AUTHOR("d.marlin <dmarlin@redhat.com"); diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c index d375cb3e77d6..60e10c0d6980 100644 --- a/drivers/mtd/nand/sharpsl.c +++ b/drivers/mtd/nand/sharpsl.c @@ -155,7 +155,7 @@ const char *part_probes[] = { "cmdlinepart", NULL }; /* * Main initialization routine */ -int __init sharpsl_nand_init(void) +static int __init sharpsl_nand_init(void) { struct nand_chip *this; struct mtd_partition *sharpsl_partition_info; @@ -257,7 +257,6 @@ module_init(sharpsl_nand_init); /* * Clean up routine */ -#ifdef MODULE static void __exit sharpsl_nand_cleanup(void) { struct nand_chip *this = (struct nand_chip *)&sharpsl_mtd[1]; @@ -272,7 +271,6 @@ static void __exit sharpsl_nand_cleanup(void) } module_exit(sharpsl_nand_cleanup); -#endif MODULE_LICENSE("GPL"); MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); diff --git a/drivers/mtd/nand/spia.c b/drivers/mtd/nand/spia.c index b06aada31f79..9737f1d67c3c 100644 --- a/drivers/mtd/nand/spia.c +++ b/drivers/mtd/nand/spia.c @@ -101,7 +101,7 @@ static void spia_hwcontrol(struct mtd_info *mtd, int cmd) /* * Main initialization routine */ -int __init spia_init(void) +static int __init spia_init(void) { struct nand_chip *this; @@ -155,7 +155,6 @@ module_init(spia_init); /* * Clean up routine */ -#ifdef MODULE static void __exit spia_cleanup(void) { /* Release resources, unregister device */ @@ -166,7 +165,6 @@ static void __exit spia_cleanup(void) } module_exit(spia_cleanup); -#endif MODULE_LICENSE("GPL"); MODULE_AUTHOR("Steven J. Hill <sjhill@realitydiluted.com"); diff --git a/drivers/mtd/nand/toto.c b/drivers/mtd/nand/toto.c index 24cfa9e2e025..c51c89559514 100644 --- a/drivers/mtd/nand/toto.c +++ b/drivers/mtd/nand/toto.c @@ -115,7 +115,7 @@ static void toto_hwcontrol(struct mtd_info *mtd, int cmd) /* * Main initialization routine */ -int __init toto_init(void) +static int __init toto_init(void) { struct nand_chip *this; int err = 0; |