Commit cead4dbc authored by David Woodhouse's avatar David Woodhouse

[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: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent ce589a03
...@@ -321,7 +321,7 @@ int au1550_device_ready(struct mtd_info *mtd) ...@@ -321,7 +321,7 @@ int au1550_device_ready(struct mtd_info *mtd)
/* /*
* Main initialization routine * Main initialization routine
*/ */
int __init au1xxx_nand_init(void) static int __init au1xxx_nand_init(void)
{ {
struct nand_chip *this; struct nand_chip *this;
u16 boot_swapboot = 0; /* default value */ u16 boot_swapboot = 0; /* default value */
...@@ -480,7 +480,6 @@ module_init(au1xxx_nand_init); ...@@ -480,7 +480,6 @@ module_init(au1xxx_nand_init);
/* /*
* Clean up routine * Clean up routine
*/ */
#ifdef MODULE
static void __exit au1550_cleanup(void) static void __exit au1550_cleanup(void)
{ {
struct nand_chip *this = (struct nand_chip *)&au1550_mtd[1]; struct nand_chip *this = (struct nand_chip *)&au1550_mtd[1];
...@@ -496,7 +495,6 @@ static void __exit au1550_cleanup(void) ...@@ -496,7 +495,6 @@ static void __exit au1550_cleanup(void)
} }
module_exit(au1550_cleanup); module_exit(au1550_cleanup);
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Embedded Edge, LLC"); MODULE_AUTHOR("Embedded Edge, LLC");
......
...@@ -124,7 +124,7 @@ int autcpu12_device_ready(struct mtd_info *mtd) ...@@ -124,7 +124,7 @@ int autcpu12_device_ready(struct mtd_info *mtd)
/* /*
* Main initialization routine * Main initialization routine
*/ */
int __init autcpu12_init(void) static int __init autcpu12_init(void)
{ {
struct nand_chip *this; struct nand_chip *this;
int err = 0; int err = 0;
...@@ -203,7 +203,6 @@ module_init(autcpu12_init); ...@@ -203,7 +203,6 @@ module_init(autcpu12_init);
/* /*
* Clean up routine * Clean up routine
*/ */
#ifdef MODULE
static void __exit autcpu12_cleanup(void) static void __exit autcpu12_cleanup(void)
{ {
/* Release resources, unregister device */ /* Release resources, unregister device */
...@@ -217,7 +216,6 @@ static void __exit autcpu12_cleanup(void) ...@@ -217,7 +216,6 @@ static void __exit autcpu12_cleanup(void)
} }
module_exit(autcpu12_cleanup); module_exit(autcpu12_cleanup);
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>"); MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>");
......
...@@ -267,7 +267,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr) ...@@ -267,7 +267,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
return err; return err;
} }
int __init cs553x_init(void) static int __init cs553x_init(void)
{ {
int err = -ENXIO; int err = -ENXIO;
int i; int i;
......
...@@ -516,7 +516,7 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, int s ...@@ -516,7 +516,7 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, int s
/* /*
* Main initialization routine * Main initialization routine
*/ */
int __init rtc_from4_init(void) static int __init rtc_from4_init(void)
{ {
struct nand_chip *this; struct nand_chip *this;
unsigned short bcr1, bcr2, wcr2; unsigned short bcr1, bcr2, wcr2;
...@@ -637,7 +637,6 @@ module_init(rtc_from4_init); ...@@ -637,7 +637,6 @@ module_init(rtc_from4_init);
/* /*
* Clean up routine * Clean up routine
*/ */
#ifdef MODULE
static void __exit rtc_from4_cleanup(void) static void __exit rtc_from4_cleanup(void)
{ {
/* Release resource, unregister partitions */ /* Release resource, unregister partitions */
...@@ -655,7 +654,6 @@ static void __exit rtc_from4_cleanup(void) ...@@ -655,7 +654,6 @@ static void __exit rtc_from4_cleanup(void)
} }
module_exit(rtc_from4_cleanup); module_exit(rtc_from4_cleanup);
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("d.marlin <dmarlin@redhat.com"); MODULE_AUTHOR("d.marlin <dmarlin@redhat.com");
......
...@@ -155,7 +155,7 @@ const char *part_probes[] = { "cmdlinepart", NULL }; ...@@ -155,7 +155,7 @@ const char *part_probes[] = { "cmdlinepart", NULL };
/* /*
* Main initialization routine * Main initialization routine
*/ */
int __init sharpsl_nand_init(void) static int __init sharpsl_nand_init(void)
{ {
struct nand_chip *this; struct nand_chip *this;
struct mtd_partition *sharpsl_partition_info; struct mtd_partition *sharpsl_partition_info;
...@@ -257,7 +257,6 @@ module_init(sharpsl_nand_init); ...@@ -257,7 +257,6 @@ module_init(sharpsl_nand_init);
/* /*
* Clean up routine * Clean up routine
*/ */
#ifdef MODULE
static void __exit sharpsl_nand_cleanup(void) static void __exit sharpsl_nand_cleanup(void)
{ {
struct nand_chip *this = (struct nand_chip *)&sharpsl_mtd[1]; struct nand_chip *this = (struct nand_chip *)&sharpsl_mtd[1];
...@@ -272,7 +271,6 @@ static void __exit sharpsl_nand_cleanup(void) ...@@ -272,7 +271,6 @@ static void __exit sharpsl_nand_cleanup(void)
} }
module_exit(sharpsl_nand_cleanup); module_exit(sharpsl_nand_cleanup);
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>"); MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
......
...@@ -101,7 +101,7 @@ static void spia_hwcontrol(struct mtd_info *mtd, int cmd) ...@@ -101,7 +101,7 @@ static void spia_hwcontrol(struct mtd_info *mtd, int cmd)
/* /*
* Main initialization routine * Main initialization routine
*/ */
int __init spia_init(void) static int __init spia_init(void)
{ {
struct nand_chip *this; struct nand_chip *this;
...@@ -155,7 +155,6 @@ module_init(spia_init); ...@@ -155,7 +155,6 @@ module_init(spia_init);
/* /*
* Clean up routine * Clean up routine
*/ */
#ifdef MODULE
static void __exit spia_cleanup(void) static void __exit spia_cleanup(void)
{ {
/* Release resources, unregister device */ /* Release resources, unregister device */
...@@ -166,7 +165,6 @@ static void __exit spia_cleanup(void) ...@@ -166,7 +165,6 @@ static void __exit spia_cleanup(void)
} }
module_exit(spia_cleanup); module_exit(spia_cleanup);
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Steven J. Hill <sjhill@realitydiluted.com"); MODULE_AUTHOR("Steven J. Hill <sjhill@realitydiluted.com");
......
...@@ -115,7 +115,7 @@ static void toto_hwcontrol(struct mtd_info *mtd, int cmd) ...@@ -115,7 +115,7 @@ static void toto_hwcontrol(struct mtd_info *mtd, int cmd)
/* /*
* Main initialization routine * Main initialization routine
*/ */
int __init toto_init(void) static int __init toto_init(void)
{ {
struct nand_chip *this; struct nand_chip *this;
int err = 0; int err = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment