diff options
| -rw-r--r-- | src/mga_dac3026.c | 4 | ||||
| -rw-r--r-- | src/mga_dacG.c | 4 | ||||
| -rw-r--r-- | src/mga_driver.c | 8 | ||||
| -rw-r--r-- | src/mga_merge.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c index 2b00f2b..9066894 100644 --- a/src/mga_dac3026.c +++ b/src/mga_dac3026.c @@ -513,7 +513,7 @@ MGA3026Init(ScrnInfoPtr pScrn, DisplayModePtr mode) /* Allocate the DacRegs space if not done already */ if (pReg->DacRegs == NULL) { - pReg->DacRegs = xnfcalloc(DACREGSIZE, 1); + pReg->DacRegs = XNFcallocarray(DACREGSIZE, 1); } for (i = 0; i < DACREGSIZE; i++) { pReg->DacRegs[i] = initDAC[i]; @@ -811,7 +811,7 @@ MGA3026Save(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, /* Allocate the DacRegs space if not done already */ if (mgaReg->DacRegs == NULL) { - mgaReg->DacRegs = xnfcalloc(DACREGSIZE, 1); + mgaReg->DacRegs = XNFcallocarray(DACREGSIZE, 1); } /* diff --git a/src/mga_dacG.c b/src/mga_dacG.c index 07bd4bd..61a4786 100644 --- a/src/mga_dacG.c +++ b/src/mga_dacG.c @@ -1160,7 +1160,7 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode) MGA_NOT_HAL( /* Allocate the DacRegs space if not done already */ if (pReg->DacRegs == NULL) { - pReg->DacRegs = xnfcalloc(DACREGSIZE, 1); + pReg->DacRegs = XNFcallocarray(DACREGSIZE, 1); } for (i = 0; i < DACREGSIZE; i++) { pReg->DacRegs[i] = initDAC[i]; @@ -1827,7 +1827,7 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, MGA_NOT_HAL( /* Allocate the DacRegs space if not done already */ if (mgaReg->DacRegs == NULL) { - mgaReg->DacRegs = xnfcalloc(DACREGSIZE, 1); + mgaReg->DacRegs = XNFcallocarray(DACREGSIZE, 1); } ); /* MGA_NOT_HAL */ diff --git a/src/mga_driver.c b/src/mga_driver.c index f4b8f12..e3bb9dd 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -666,7 +666,7 @@ MGAGetRec(ScrnInfoPtr pScrn) if (pScrn->driverPrivate != NULL) return TRUE; - pScrn->driverPrivate = xnfcalloc(sizeof(MGARec), 1); + pScrn->driverPrivate = XNFcallocarray(sizeof(MGARec), 1); /* Initialise it */ MGAPTR(pScrn)->Dac = DacInit; @@ -767,7 +767,7 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev, MGAEntityIndex = xf86AllocateEntityPrivateIndex(); pPriv = xf86GetEntityPrivate(pScrn->entityList[0], MGAEntityIndex); if (!pPriv->ptr) { - pPriv->ptr = xnfcalloc(sizeof(MGAEntRec), 1); + pPriv->ptr = XNFcallocarray(sizeof(MGAEntRec), 1); pMgaEnt = pPriv->ptr; pMgaEnt->lastInstance = -1; } else { @@ -987,7 +987,7 @@ MGAProbe(DriverPtr drv, int flags) MGAEntityIndex = xf86AllocateEntityPrivateIndex(); pPriv = xf86GetEntityPrivate(pScrn->entityList[0], MGAEntityIndex); if (!pPriv->ptr) { - pPriv->ptr = xnfcalloc(sizeof(MGAEntRec), 1); + pPriv->ptr = XNFcallocarray(sizeof(MGAEntRec), 1); pMgaEnt = pPriv->ptr; pMgaEnt->lastInstance = -1; } else { @@ -2340,7 +2340,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) * Setup the ClockRanges, which describe what clock ranges are available, * and what sort of modes they can be used for. */ - clockRanges = xnfcalloc(sizeof(ClockRange), 1); + clockRanges = XNFcallocarray(sizeof(ClockRange), 1); clockRanges->next = NULL; clockRanges->minClock = pMga->MinClock; clockRanges->maxClock = pMga->MaxClock; diff --git a/src/mga_merge.c b/src/mga_merge.c index 3f85865..0b0c58f 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -443,7 +443,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) * Setup the ClockRanges, which describe what clock ranges are available, * and what sort of modes they can be used for. */ - clockRanges = xnfcalloc(sizeof(ClockRange), 1); + clockRanges = XNFcallocarray(sizeof(ClockRange), 1); clockRanges->next = NULL; clockRanges->minClock = pMga->MinClock; clockRanges->maxClock = pMga->MaxClock; |