From c61e7148ac7dba2715b060289b65d59938866edd Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 21 May 2006 18:38:51 +0100
Subject: [PATCH] --- yaml --- r: 27807 b: refs/heads/master c:
 ecde26313076e5055dcd54d6537632275346203f h: refs/heads/master i:   27805:
 f1f33cb6379ee688d1e90bb65aa203e3a5f8bb7b   27803:
 3e1abe6a09e6e66d3f7f7027b67171f72527f8aa   27799:
 9a01752ffbc1a18d59a009b3d0b289d2b5801e31   27791:
 78cf99b027dc507283c7a3d01cf4d10bdefeb848   27775:
 c068fc7409f3fb1a533ac3dc34f56643911e5f07 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/mtd/devices/docprobe.c | 47 +++-------------------------
 2 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index 80f12ffb30f2..8dd660175e92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d12c0c75db0cd85beb11c4e2d86a49cabe3cfff
+refs/heads/master: ecde26313076e5055dcd54d6537632275346203f
diff --git a/trunk/drivers/mtd/devices/docprobe.c b/trunk/drivers/mtd/devices/docprobe.c
index dce4c904b636..593bb033a3fa 100644
--- a/trunk/drivers/mtd/devices/docprobe.c
+++ b/trunk/drivers/mtd/devices/docprobe.c
@@ -231,26 +231,9 @@ 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)
 {
@@ -260,8 +243,6 @@ 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);
@@ -299,48 +280,30 @@ static void __init DoC_Probe(unsigned long physadr)
 		switch(ChipID) {
 		case DOC_ChipID_Doc2kTSOP:
 			name="2000 TSOP";
-			im_funcname = "DoC2k_init";
-			im_modname = "doc2000";
-			initroutine = doc2k_initfunc;
+			initroutine = symbol_request(DoC2k_init);
 			break;
 
 		case DOC_ChipID_Doc2k:
 			name="2000";
-			im_funcname = "DoC2k_init";
-			im_modname = "doc2000";
-			initroutine = doc2k_initfunc;
+			initroutine = symbol_request(DoC2k_init);
 			break;
 
 		case DOC_ChipID_DocMil:
 			name="Millennium";
 #ifdef DOC_SINGLE_DRIVER
-			im_funcname = "DoC2k_init";
-			im_modname = "doc2000";
-			initroutine = doc2k_initfunc;
+			initroutine = symbol_request(DoC2k_init);
 #else
-			im_funcname = "DoCMil_init";
-			im_modname = "doc2001";
-			initroutine = docmil_initfunc;
+			initroutine = symbol_request(DoCMil_init);
 #endif /* DOC_SINGLE_DRIVER */
 			break;
 
 		case DOC_ChipID_DocMilPlus16:
 		case DOC_ChipID_DocMilPlus32:
 			name="MillenniumPlus";
-			im_funcname = "DoCMilPlus_init";
-			im_modname = "doc2001plus";
-			initroutine = docmplus_initfunc;
+			initroutine = symbol_request(DoCMilPlus_init);
 			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);