Remove useless loader symbol lists.

1 files changed, 0 insertions, 121 deletions

diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 0f605df..61e2273 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -252,101 +252,6 @@ static const OptionInfoRec S3VOptions[] =
    {-1, NULL, OPTV_NONE,	{0}, FALSE}
 };
 
-
-/*
- * Lists of symbols that may/may not be required by this driver.
- * This allows the loader to know which ones to issue warnings for.
- *
- * Note that vgahwSymbols and xaaSymbols are referenced outside the
- * XFree86LOADER define in later code, so are defined outside of that
- * define here also.
- */
-
-static const char *vgahwSymbols[] = {
-    "vgaHWBlankScreen",
-    "vgaHWCopyReg",
-    "vgaHWGetHWRec",
-    "vgaHWGetIOBase",
-    "vgaHWGetIndex",
-    "vgaHWInit",
-    "vgaHWLock",
-    "vgaHWMapMem",
-    "vgaHWProtect",
-    "vgaHWRestore",
-    "vgaHWSave",
-    "vgaHWSaveScreen",
-    "vgaHWSetMmioFuncs",
-    "vgaHWSetStdFuncs",
-    "vgaHWUnmapMem",
-    "vgaHWddc1SetSpeedWeak",
-   /* not used by ViRGE (at the moment :( ) */
-   /*
-    "vgaHWUnlock",
-    "vgaHWFreeHWRec",
-    */
-    NULL
-};
-
-static const char *xaaSymbols[] = {
-    "XAAGetCopyROP",
-    "XAAGetCopyROP_PM",
-    "XAADestroyInfoRec",
-    "XAACreateInfoRec",
-    "XAAHelpPatternROP",
-    "XAAHelpSolidROP",
-    "XAAInit",
-    NULL
-};
-
-static const char *ramdacSymbols[] = {
-    "xf86CreateCursorInfoRec",
-    "xf86InitCursor",
-#if 0
-    "xf86DestroyCursorInfoRec",
-#endif
-    NULL
-};
-
-static const char *ddcSymbols[] = {
-    "xf86PrintEDID",
-    "xf86DoEDID_DDC1",
-    "xf86DoEDID_DDC2",
-    "xf86SetDDCproperties",
-    NULL
-};
-
-static const char *i2cSymbols[] = {
-    "xf86CreateI2CBusRec",
-    "xf86I2CBusInit",
-    NULL
-};
-
-static const char *shadowSymbols[] = {
-    "ShadowFBInit",
-    NULL
-};
-
-static const char *vbeSymbols[] = {
-    "VBEInit",
-    "vbeDoEDID",
-    "vbeFree",
-    NULL
-};
-
-static const char *fbSymbols[] = {
-  "fbPictureInit",
-  "fbScreenInit",
-  NULL
-};
-
-#if USE_INT10
-static const char *int10Symbols[] = {
-    "xf86InitInt10",
-    "xf86FreeInt10",
-    NULL
-};
-#endif
-
 #ifdef XFree86LOADER
 
 static MODULESETUPPROTO(s3virgeSetup);
@@ -387,22 +292,6 @@ s3virgeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 	xf86AddDriver(&S3VIRGE, module, 0);
 
 	/*
-	 * Modules that this driver always requires can be loaded here
-	 * by calling LoadSubModule().
-	 */
-
-	/*
-	 * Tell the loader about symbols from other modules that this module
-	 * might refer to.
-	 */
-	LoaderRefSymLists(vgahwSymbols, xaaSymbols, ramdacSymbols,
-			  ddcSymbols, i2cSymbols,
-#if USE_INT10
-			  int10Symbols,
-#endif
-			  vbeSymbols, shadowSymbols, fbSymbols, NULL);
-			  
-	/*
 	 * The return value must be non-NULL on success even though there
 	 * is no TearDownProc.
 	 */
@@ -616,8 +505,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
     if (!xf86LoadSubModule(pScrn, "vgahw"))
 	return FALSE;
 	   
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
-	
     /*
      * Allocate a vgaHWRec
      */
@@ -908,7 +795,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 #if USE_INT10
     if (xf86LoadSubModule(pScrn, "int10")) {
  	xf86Int10InfoPtr pInt;
- 	xf86LoaderReqSymLists(int10Symbols, NULL);
 #if 1
 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
 	pInt = xf86InitInt10(pEnt->index);
@@ -917,7 +803,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
     }
 #endif
     if (xf86LoadSubModule(pScrn, "vbe")) {
-	xf86LoaderReqSymLists(vbeSymbols, NULL);
 	ps3v->pVbe =  VBEInit(NULL,pEnt->index);
     }
 
@@ -1032,7 +917,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
    if (xf86LoadSubModule(pScrn, "ddc")) {
        xf86MonPtr pMon = NULL;
        
-       xf86LoaderReqSymLists(ddcSymbols, NULL);
        if ((ps3v->pVbe) 
 	   && ((pMon = xf86PrintEDID(vbeDoEDID(ps3v->pVbe, NULL))) != NULL))
 	   xf86SetDDCproperties(pScrn,pMon);
@@ -1427,7 +1311,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 	S3VFreeRec(pScrn);
 	return FALSE;
     }	       
-    xf86LoaderReqSymLists(fbSymbols, NULL);       
 
     /* Load XAA if needed */
     if (!ps3v->NoAccel || ps3v->hwcursor ) {
@@ -1435,7 +1318,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 	    S3VFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(xaaSymbols, NULL);
     }
 
     /* Load ramdac if needed */
@@ -1444,7 +1326,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 	    S3VFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(ramdacSymbols, NULL);
     }
 
     if (ps3v->shadowFB) {
@@ -1452,7 +1333,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
 	    S3VFreeRec(pScrn);
 	    return FALSE;
 	}
-	xf86LoaderReqSymLists(shadowSymbols, NULL);
     }
 
     /* Setup WAITFIFO() for accel and ModeInit() */
@@ -3890,7 +3770,6 @@ S3Vddc2(int scrnIndex)
     S3VPtr ps3v = S3VPTR(pScrn);
     
     if ( xf86LoadSubModule(pScrn, "i2c") ) {
-	xf86LoaderReqSymLists(i2cSymbols,NULL);
 	if (S3V_I2CInit(pScrn)) {
 	    CARD32 tmp = (INREG(DDC_REG));
 	    OUTREG(DDC_REG,(tmp | 0x13));