summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Weigelt, metux IT consult <info@metux.net>2024-05-08 14:33:27 +0200
committerMarge Bot <emma+marge@anholt.net>2024-05-11 19:52:26 +0000
commitf189faf98bdfd8cac757264bca05a762b67dc0d0 (patch)
tree9a7cd1fcf05e3e483c5e633e5d9084d91fa8554a
parent34483e1ba9ec7ed34f606afe85c464b27b1f8fe2 (diff)
use XNFcallocarray() instead of xnfcalloc macroHEADmaster
xnfcalloc is just an alias for XNFcallocarray() that doesn't seem to serve any practical purpose, so it can go away once all drivers stopped using it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-chips/-/merge_requests/8>
-rw-r--r--src/ct_driver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 3bf7dc3..0ea8128 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -782,7 +782,7 @@ CHIPSGetRec(ScrnInfoPtr pScrn)
if (pScrn->driverPrivate != NULL)
return TRUE;
- pScrn->driverPrivate = xnfcalloc(sizeof(CHIPSRec), 1);
+ pScrn->driverPrivate = XNFcallocarray(sizeof(CHIPSRec), 1);
if (pScrn->driverPrivate == NULL)
return FALSE;
@@ -871,7 +871,7 @@ CHIPSPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
CHIPSEntityIndex = xf86AllocateEntityPrivateIndex();
pPriv = xf86GetEntityPrivate(pScrn->entityList[0], CHIPSEntityIndex);
if (!pPriv->ptr) {
- pPriv->ptr = xnfcalloc(sizeof(CHIPSEntRec), 1);
+ pPriv->ptr = XNFcallocarray(sizeof(CHIPSEntRec), 1);
cPtrEnt = pPriv->ptr;
cPtrEnt->lastInstance = -1;
} else {
@@ -955,7 +955,7 @@ CHIPSProbe(DriverPtr drv, int flags)
pPriv = xf86GetEntityPrivate(pScrn->entityList[0],
CHIPSEntityIndex);
if (!pPriv->ptr) {
- pPriv->ptr = xnfcalloc(sizeof(CHIPSEntRec), 1);
+ pPriv->ptr = XNFcallocarray(sizeof(CHIPSEntRec), 1);
cPtrEnt = pPriv->ptr;
cPtrEnt->lastInstance = -1;
} else {
@@ -1264,7 +1264,7 @@ CHIPSPreInit(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->ClockMulFactor = cPtr->ClockMulFactor;
clockRanges->minClock = cPtr->MinClock;
@@ -4095,7 +4095,7 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
miBankInfoPtr pBankInfo;
/* Setup the vga banking variables */
- pBankInfo = (miBankInfoPtr)xnfcalloc(sizeof(miBankInfoRec),1);
+ pBankInfo = (miBankInfoPtr)XNFcallocarray(sizeof(miBankInfoRec),1);
if (pBankInfo == NULL)
return FALSE;