[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>
This commit is contained in:
David Woodhouse 2006-05-16 13:54:50 +01:00
parent ce589a0328
commit cead4dbc03
7 changed files with 7 additions and 17 deletions

View File

@ -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");

View File

@ -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>");

View File

@ -267,7 +267,7 @@ out:
return err;
}
int __init cs553x_init(void)
static int __init cs553x_init(void)
{
int err = -ENXIO;
int i;

View File

@ -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");

View File

@ -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>");

View File

@ -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");

View File

@ -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;