Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cead4dbc authored by David Woodhouse's avatar David Woodhouse
Browse files

[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

drivers/mtd/nand/au1550nd.c

+1 −3
Original line number Diff line number Diff line
@@ -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");

drivers/mtd/nand/autcpu12.c

+1 −3
Original line number Diff line number Diff line
@@ -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>");

drivers/mtd/nand/cs553x_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr) 
	return err;

}



int __init cs553x_init(void)

static int __init cs553x_init(void)

{

	int err = -ENXIO;

	int i;

drivers/mtd/nand/rtc_from4.c

+1 −3
Original line number Diff line number Diff line
@@ -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");

drivers/mtd/nand/sharpsl.c

+1 −3
Original line number Diff line number Diff line
@@ -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>");