[2.6 patch] drivers/mtd/: small cleanups

From: Adrian Bunk
Date: Fri Jan 06 2006 - 14:19:08 EST


This patch contains the following cleanups:
- chips/sharp.c: make two needlessly global functions static
- move some declarations to a header file where they belong to


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

drivers/mtd/chips/sharp.c | 7 +++----
drivers/mtd/inftlcore.c | 5 -----
include/linux/mtd/inftl.h | 5 +++++
3 files changed, 8 insertions(+), 9 deletions(-)

--- linux-2.6.15-rc5-mm2-full/include/linux/mtd/inftl.h.old 2005-12-13 00:38:32.000000000 +0100
+++ linux-2.6.15-rc5-mm2-full/include/linux/mtd/inftl.h 2005-12-13 00:40:26.000000000 +0100
@@ -52,6 +52,11 @@
int INFTL_mount(struct INFTLrecord *s);
int INFTL_formatblock(struct INFTLrecord *s, int block);

+extern char inftlmountrev[];
+
+void INFTL_dumptables(struct INFTLrecord *s);
+void INFTL_dumpVUchains(struct INFTLrecord *s);
+
#endif /* __KERNEL__ */

#endif /* __MTD_INFTL_H__ */
--- linux-2.6.15-rc5-mm2-full/drivers/mtd/inftlcore.c.old 2005-12-13 00:39:14.000000000 +0100
+++ linux-2.6.15-rc5-mm2-full/drivers/mtd/inftlcore.c 2005-12-13 00:40:43.000000000 +0100
@@ -47,9 +47,6 @@
*/
#define MAX_LOOPS 10000

-extern void INFTL_dumptables(struct INFTLrecord *inftl);
-extern void INFTL_dumpVUchains(struct INFTLrecord *inftl);
-
static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
{
struct INFTLrecord *inftl;
@@ -885,8 +882,6 @@
.owner = THIS_MODULE,
};

-extern char inftlmountrev[];
-
static int __init init_inftl(void)
{
printk(KERN_INFO "INFTL: inftlcore.c $Revision: 1.19 $, "

--- linux-2.6.15-mm1-full/drivers/mtd/chips/sharp.c.old 2006-01-06 19:37:50.000000000 +0100
+++ linux-2.6.15-mm1-full/drivers/mtd/chips/sharp.c 2006-01-06 19:38:32.000000000 +0100
@@ -64,7 +64,7 @@

#undef AUTOUNLOCK /* automatically unlocks blocks before erasing */

-struct mtd_info *sharp_probe(struct map_info *);
+static struct mtd_info *sharp_probe(struct map_info *);

static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd);

@@ -96,7 +96,6 @@
struct flchip chips[1];
};

-struct mtd_info *sharp_probe(struct map_info *map);
static void sharp_destroy(struct mtd_info *mtd);

static struct mtd_chip_driver sharp_chipdrv = {
@@ -107,7 +106,7 @@
};


-struct mtd_info *sharp_probe(struct map_info *map)
+static struct mtd_info *sharp_probe(struct map_info *map)
{
struct mtd_info *mtd = NULL;
struct sharp_info *sharp = NULL;
@@ -581,7 +580,7 @@

}

-int __init sharp_probe_init(void)
+static int __init sharp_probe_init(void)
{
printk("MTD Sharp chip driver <ds@xxxxxxxxx>\n");

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/