[PATCH 11/16] use XNFcallocarray() instead of xnfcalloc macro
Enrico Weigelt, metux IT consult
info at metux.net
Tue Mar 4 15:58:04 UTC 2025
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 at metux.net>
---
src/legacy/i810/i810_driver.c | 4 ++--
src/legacy/i810/i810_xaa.c | 4 ++--
src/uxa/intel_driver.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
index 778b1a41..e24d3f8b 100644
--- a/src/legacy/i810/i810_driver.c
+++ b/src/legacy/i810/i810_driver.c
@@ -155,7 +155,7 @@ I810GetRec(ScrnInfoPtr scrn)
if (((uintptr_t)scrn->driverPrivate & 3) == 0)
return TRUE;
- scrn->driverPrivate = xnfcalloc(sizeof(I810Rec), 1);
+ scrn->driverPrivate = XNFcallocarray(sizeof(I810Rec), 1);
return TRUE;
}
@@ -503,7 +503,7 @@ I810PreInit(ScrnInfoPtr scrn, int flags)
pI810->MaxClock = 86000;
}
}
- clockRanges = xnfcalloc(sizeof(ClockRange), 1);
+ clockRanges = XNFcallocarray(sizeof(ClockRange), 1);
clockRanges->next = NULL;
/* 9.4MHz appears to be the smallest that works. */
clockRanges->minClock = 9500;
diff --git a/src/legacy/i810/i810_xaa.c b/src/legacy/i810/i810_xaa.c
index ea03441b..1e0a8527 100644
--- a/src/legacy/i810/i810_xaa.c
+++ b/src/legacy/i810/i810_xaa.c
@@ -284,7 +284,7 @@ I810AccelInit(ScreenPtr pScreen)
pI810->NumScanlineColorExpandBuffers = nr_buffers;
pI810->ScanlineColorExpandBuffers = (unsigned char **)
- xnfcalloc(nr_buffers, sizeof(unsigned char *));
+ XNFcallocarray(nr_buffers, sizeof(unsigned char *));
for (i = 0; i < nr_buffers; i++, ptr += width)
pI810->ScanlineColorExpandBuffers[i] = ptr;
@@ -295,7 +295,7 @@ I810AccelInit(ScreenPtr pScreen)
| 0);
infoPtr->ScanlineColorExpandBuffers = (unsigned char **)
- xnfcalloc(1, sizeof(unsigned char *));
+ XNFcallocarray(1, sizeof(unsigned char *));
infoPtr->NumScanlineColorExpandBuffers = 1;
infoPtr->ScanlineColorExpandBuffers[0] =
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 79105b89..24783492 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -460,7 +460,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
return TRUE;
if (((uintptr_t)scrn->driverPrivate) & 3) {
- intel = xnfcalloc(sizeof(*intel), 1);
+ intel = XNFcallocarray(sizeof(*intel), 1);
if (intel == NULL)
return FALSE;
--
2.39.5
More information about the Intel-gfx
mailing list