[PATCH xf86-driver-voodoo 1/2] Convert x+m/calloc/free to m/calloc/free.

[Trevor Woerner]

From: Trevor Woerner <twoerner at gmail.com>

Signed-off-by: Trevor Woerner <twoerner at gmail.com>
---
 src/voodoo_dga.c    |    2 +-
 src/voodoo_driver.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 5b960e8..6e2da51 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -136,7 +136,7 @@ static void VoodooDGAAddModes(ScrnInfoPtr pScrn)
     DGAModePtr pDGAMode;
 
     do {
-	pDGAMode = xrealloc(pVoo->pDGAMode,
+	pDGAMode = realloc(pVoo->pDGAMode,
 			    (pVoo->nDGAMode + 1) * sizeof(DGAModeRec));
 	if (!pDGAMode)
 	    break;
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index ca7ba71..d5d5971 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -195,7 +195,7 @@ VoodooFreeRec(ScrnInfoPtr pScrn)
 {
   if (pScrn->driverPrivate == NULL)
     return;
-  xfree(pScrn->driverPrivate);
+  free(pScrn->driverPrivate);
   pScrn->driverPrivate = NULL;
 }
 
@@ -278,10 +278,10 @@ VoodooProbe(DriverPtr drv, int flags)
 		}
 		pEnt = xf86GetEntityInfo(usedChips[i]);
 	    }
-	    xfree(usedChips);
+	    free(usedChips);
 	}
     }
-    xfree(devSections);
+    free(devSections);
     return foundScreen;
 }
 	
@@ -389,7 +389,7 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags)
   xf86CollectOptions(pScrn, NULL);
 
   /* Process the options */
-  if (!(pVoo->Options = xalloc(sizeof(VoodooOptions))))
+  if (!(pVoo->Options = malloc(sizeof(VoodooOptions))))
     return FALSE;
   memcpy(pVoo->Options, VoodooOptions, sizeof(VoodooOptions));
   xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pVoo->Options);
@@ -768,11 +768,11 @@ VoodooCloseScreen(int scrnIndex, ScreenPtr pScreen)
   if (pScrn->vtSema)
       VoodooRestore(pScrn, TRUE);
   if(pVoo->ShadowPtr)
-      xfree(pVoo->ShadowPtr);
+      free(pVoo->ShadowPtr);
   if(pVoo->AccelInfoRec)
-      xfree(pVoo->AccelInfoRec);
+      free(pVoo->AccelInfoRec);
   if (pVoo->pDGAMode) {
-    xfree(pVoo->pDGAMode);
+    free(pVoo->pDGAMode);
     pVoo->pDGAMode = NULL;
     pVoo->nDGAMode = 0;
   }
@@ -797,7 +797,7 @@ VoodooFreeScreen(int scrnIndex, int flags)
    * get called routinely at the end of a server generation.
    */
   if (pVoo && pVoo->ShadowPtr)
-    xfree(pVoo->ShadowPtr);
+    free(pVoo->ShadowPtr);
   VoodooFreeRec(xf86Screens[scrnIndex]);
 }
 
-- 
1.7.3.1.127.g1bb28