Remove useless loader symbol lists.

1 files changed, 4 insertions, 109 deletions

diff --git a/src/i128_driver.c b/src/i128_driver.c
index 0c80ce4..9de7527 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -166,87 +166,6 @@ _X_EXPORT XF86ModuleData i128ModuleData = { &i128VersRec, i128Setup, NULL };
 
 #endif
 
-
-/*
- * List of symbols from other modules that this module references.  This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists().  The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.  These are provided to the
- * LoaderRefSymLists() function in the module specific Setup() function.
- */
-
-static const char *vgahwSymbols[] = {
-    "vgaHWFreeHWRec",
-    "vgaHWGetHWRec",
-    "vgaHWGetIOBase",  
-    "vgaHWGetIndex",  
-    "vgaHWProtect",
-    "vgaHWRestore",
-    "vgaHWSave",
-    NULL
-};      
-
-static const char *fbSymbols[] = {
-    "fbScreenInit",
-    "fbPictureInit",
-    NULL
-};
-
-static const char *exaSymbols[] = {
-    "exaDriverAlloc",
-    "exaDriverInit",
-    "exaDriverFini",
-    "exaGetPixmapOffset",
-    NULL
-};
-
-static const char *xaaSymbols[] = {
-    "XAACreateInfoRec",
-    "XAADestroyInfoRec",
-    "XAAInit",
-    NULL
-};
-
-static const char *ramdacSymbols[] = {
-    "xf86CreateCursorInfoRec",
-    "xf86DestroyCursorInfoRec",
-    "xf86InitCursor",
-    NULL
-};
-
-static const char *ddcSymbols[] = {
-    "xf86DoEDID_DDC1",
-    "xf86DoEDID_DDC2",
-    "xf86PrintEDID",
-    "xf86SetDDCproperties",
-    NULL
-};
-
-static const char *i2cSymbols[] = {
-    "xf86CreateI2CBusRec",
-    "xf86I2CBusInit",
-    NULL
-};
-
-#ifdef XFree86LOADER
-/* XXX The vbe module isn't currently loaded. */
-static const char *vbeSymbols[] = {
-    "VBEInit",
-    "vbeDoEDID",
-    NULL
-};
-
-/* XXX The int10 module isn't currently loaded. */
-static const char *int10Symbols[] = {
-    "xf86InitInt10",
-    "xf86FreeInt10",
-    NULL
-};
-#endif
-
-
 #ifdef XFree86LOADER
 
 /* Mandatory
@@ -283,22 +202,6 @@ i128Setup(pointer module, pointer opts, int *errmaj, int *errmin)
 	 */
 
 	/*
-	 * Tell the loader about symbols from other modules that this module
-	 * might refer to.
-	 */
-	LoaderRefSymLists(fbSymbols,
-			  exaSymbols,
-			  xaaSymbols, 
-			  ramdacSymbols,
-			  ddcSymbols,
-			  ddcSymbols,
-			  i2cSymbols,
-			  vbeSymbols,
-			  int10Symbols,
-			  vgahwSymbols,
-			  NULL);
-
-	/*
 	 * The return value must be non-NULL on success even though there
 	 * is no TearDownProc.
 	 */
@@ -580,8 +483,6 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
     if (!xf86LoadSubModule(pScrn, "vgahw"))
         return FALSE;
     
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
     /*
      * Allocate a vgaHWRec
      */
@@ -874,9 +775,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
     /* Load DDC if we have the code to use it */
     /* This gives us DDC1 */
     if (pI128->ddc1Read || pI128->i2cInit) {
-        if (xf86LoadSubModule(pScrn, "ddc")) {
-          xf86LoaderReqSymLists(ddcSymbols, NULL);
-        } else {
+        if (!xf86LoadSubModule(pScrn, "ddc")) {
           /* ddc module not found, we can do without it */
           pI128->ddc1Read = NULL;
 
@@ -887,9 +786,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
     /* - DDC can use I2C bus */
     /* Load I2C if we have the code to use it */
     if (pI128->i2cInit) {
-      if ( xf86LoadSubModule(pScrn, "i2c") ) {
-        xf86LoaderReqSymLists(i2cSymbols,NULL);
-      } else {
+      if (!xf86LoadSubModule(pScrn, "i2c")) {
         /* i2c module not found, we can do without it */
         pI128->i2cInit = NULL;
         pI128->I2C = NULL;
@@ -1194,7 +1091,6 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
 	I128FreeRec(pScrn);
 	return FALSE;
     }
-    xf86LoaderReqSymLists(fbSymbols, NULL);
 
     /* Load the acceleration engine */
     if (!pI128->NoAccel) {
@@ -1211,12 +1107,12 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
 		LoaderErrorMsg(NULL, "exa", errmaj, errmin);
                 I128FreeRec(pScrn);
                 return FALSE;
-            } else xf86LoaderReqSymLists(exaSymbols, NULL);
+            }
         } else {
             if (!xf86LoadSubModule(pScrn, "xaa")) {
 	        I128FreeRec(pScrn);
 	        return FALSE;
-	    } else xf86LoaderReqSymLists(xaaSymbols, NULL);
+	    }
         }
     }
 
@@ -1226,7 +1122,6 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
 	    I128FreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(ramdacSymbols, NULL);
     }
 
     I128UnmapMem(pScrn);