---

yaml
---
r: 27809
b: refs/heads/master
c: 9641b78
h: refs/heads/master
i:
  27807: c61e714
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 615191bb1dfc6980e7c7a85225444d860d74b343
+refs/heads/master: 9641b784ff82cf0a48a6c70ef9867f5fd728de67

trunk/drivers/mtd/chips/gen_probe.c

@@ -207,14 +207,14 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map,
 	struct cfi_private *cfi = map->fldrv_priv;
 	__u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID;
 #ifdef CONFIG_MODULES
-	char probename[16+sizeof(MODULE_SYMBOL_PREFIX)];
+	char probename[32];
 	cfi_cmdset_fn_t *probe_function;
 
-	sprintf(probename, MODULE_SYMBOL_PREFIX "cfi_cmdset_%4.4X", type);
+	sprintf(probename, "cfi_cmdset_%4.4X", type);
 
 	probe_function = __symbol_get(probename);
 	if (!probe_function) {
-		request_module(probename + sizeof(MODULE_SYMBOL_PREFIX) - 1);
+		request_module(probename);
 		probe_function = __symbol_get(probename);
 	}
 

trunk/drivers/mtd/devices/docprobe.c

@@ -231,9 +231,26 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
 
 static int docfound;
 
+#ifdef CONFIG_MTD_DOC2000
 extern void DoC2k_init(struct mtd_info *);
+#define doc2k_initfunc (&DoC2k_init)
+#else 
+#define doc2k_initfunc NULL
+#endif
+
+#ifdef CONFIG_MTD_DOC2001
 extern void DoCMil_init(struct mtd_info *);
+#define docmil_initfunc (&DoCMil_init)
+#else 
+#define docmil_initfunc NULL
+#endif
+
+#ifdef CONFIG_MTD_DOC2001PLUS
 extern void DoCMilPlus_init(struct mtd_info *);
+#define docmplus_initfunc (&DoCMilPlus_init)
+#else 
+#define docmplus_initfunc NULL
+#endif
 
 static void __init DoC_Probe(unsigned long physadr)
 {
@@ -243,6 +260,8 @@ static void __init DoC_Probe(unsigned long physadr)
 	int ChipID;
 	char namebuf[15];
 	char *name = namebuf;
+	char *im_funcname = NULL;
+	char *im_modname = NULL;
 	void (*initroutine)(struct mtd_info *) = NULL;
 
 	docptr = ioremap(physadr, DOC_IOREMAP_LEN);
@@ -280,30 +299,48 @@ static void __init DoC_Probe(unsigned long physadr)
 		switch(ChipID) {
 		case DOC_ChipID_Doc2kTSOP:
 			name="2000 TSOP";
-			initroutine = symbol_request(DoC2k_init);
+			im_funcname = "DoC2k_init";
+			im_modname = "doc2000";
+			initroutine = doc2k_initfunc;
 			break;
 
 		case DOC_ChipID_Doc2k:
 			name="2000";
-			initroutine = symbol_request(DoC2k_init);
+			im_funcname = "DoC2k_init";
+			im_modname = "doc2000";
+			initroutine = doc2k_initfunc;
 			break;
 
 		case DOC_ChipID_DocMil:
 			name="Millennium";
 #ifdef DOC_SINGLE_DRIVER
-			initroutine = symbol_request(DoC2k_init);
+			im_funcname = "DoC2k_init";
+			im_modname = "doc2000";
+			initroutine = doc2k_initfunc;
 #else
-			initroutine = symbol_request(DoCMil_init);
+			im_funcname = "DoCMil_init";
+			im_modname = "doc2001";
+			initroutine = docmil_initfunc;
 #endif /* DOC_SINGLE_DRIVER */
 			break;
 
 		case DOC_ChipID_DocMilPlus16:
 		case DOC_ChipID_DocMilPlus32:
 			name="MillenniumPlus";
-			initroutine = symbol_request(DoCMilPlus_init);
+			im_funcname = "DoCMilPlus_init";
+			im_modname = "doc2001plus";
+			initroutine = docmplus_initfunc;
 			break;
 		}
 
+#ifdef CONFIG_MODULES
+		if (im_funcname && !initroutine)
+			initroutine = __symbol_get(im_funcname);
+		if (im_funcname && !initroutine) {
+			request_module(im_modname);
+			initroutine = __symbol_get(im_funcname);
+		}
+#endif
 		if (initroutine) {
 			(*initroutine)(mtd);
 			symbol_put_addr(initroutine);

trunk/drivers/mtd/nand/Kconfig

@@ -49,12 +49,6 @@ config MTD_NAND_SPIA
 	help
 	  If you had to ask, you don't have one. Say 'N'.
 
-config MTD_NAND_AMS_DELTA
-	tristate "NAND Flash device on Amstrad E3"
-	depends on MACH_AMS_DELTA && MTD_NAND
-	help
-	  Support for NAND flash on Amstrad E3 (Delta).
-
 config MTD_NAND_TOTO
 	tristate "NAND Flash device on TOTO board"
 	depends on ARCH_OMAP && MTD_NAND

trunk/drivers/mtd/nand/Makefile

@@ -7,7 +7,6 @@ obj-$(CONFIG_MTD_NAND)			+= nand.o nand_ecc.o
 obj-$(CONFIG_MTD_NAND_IDS)		+= nand_ids.o
 
 obj-$(CONFIG_MTD_NAND_SPIA)		+= spia.o
-obj-$(CONFIG_MTD_NAND_AMS_DELTA)	+= ams-delta.o
 obj-$(CONFIG_MTD_NAND_TOTO)		+= toto.o
 obj-$(CONFIG_MTD_NAND_AUTCPU12)		+= autcpu12.o
 obj-$(CONFIG_MTD_NAND_EDB7312)		+= edb7312.o