summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/geode_dcon.c2
-rw-r--r--src/gx_driver.c4
-rw-r--r--src/lx_display.c2
-rw-r--r--src/lx_driver.c2
-rw-r--r--src/lx_output.c2
-rw-r--r--src/lx_panel.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/geode_dcon.c b/src/geode_dcon.c
index 5efd79e..20ca194 100644
--- a/src/geode_dcon.c
+++ b/src/geode_dcon.c
@@ -126,7 +126,7 @@ dcon_init(ScrnInfoPtr pScrni)
return FALSE;
}
- pGeode->panelMode = xnfcalloc(1, sizeof(DisplayModeRec));
+ pGeode->panelMode = XNFcallocarray(1, sizeof(DisplayModeRec));
if (pGeode->panelMode == NULL)
return FALSE;
diff --git a/src/gx_driver.c b/src/gx_driver.c
index 0471389..2a45e61 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -462,7 +462,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
return FALSE;
#endif
- pGeode = pScrni->driverPrivate = xnfcalloc(1, sizeof(GeodeRec));
+ pGeode = pScrni->driverPrivate = XNFcallocarray(1, sizeof(GeodeRec));
if (pGeode == NULL)
return FALSE;
@@ -692,7 +692,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
else
pScrni->videoRam = pGeode->pEnt->device->videoRam;
- GeodeClockRange = (ClockRangePtr) xnfcalloc(1, sizeof(ClockRange));
+ GeodeClockRange = (ClockRangePtr) XNFcallocarray(1, sizeof(ClockRange));
GeodeClockRange->next = NULL;
GeodeClockRange->minClock = 25175;
GeodeClockRange->maxClock = 229500;
diff --git a/src/lx_display.c b/src/lx_display.c
index 2aeb3b4..43d20b3 100644
--- a/src/lx_display.c
+++ b/src/lx_display.c
@@ -576,7 +576,7 @@ LXSetupCrtc(ScrnInfoPtr pScrni)
return;
}
- lxpriv = xnfcalloc(1, sizeof(LXCrtcPrivateRec));
+ lxpriv = XNFcallocarray(1, sizeof(LXCrtcPrivateRec));
if (!lxpriv) {
xf86CrtcDestroy(crtc);
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 0f04579..a199310 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -324,7 +324,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
return TRUE;
}
- pGeode = pScrni->driverPrivate = xnfcalloc(1, sizeof(GeodeRec));
+ pGeode = pScrni->driverPrivate = XNFcallocarray(1, sizeof(GeodeRec));
if (pGeode == NULL)
return FALSE;
diff --git a/src/lx_output.c b/src/lx_output.c
index 40455ce..4cd5b64 100644
--- a/src/lx_output.c
+++ b/src/lx_output.c
@@ -285,7 +285,7 @@ LXSetupOutput(ScrnInfoPtr pScrni)
output = xf86OutputCreate(pScrni, &lx_output_funcs, "default");
- lxpriv = xnfcalloc(1, sizeof(LXOutputPrivateRec));
+ lxpriv = XNFcallocarray(1, sizeof(LXOutputPrivateRec));
if (!lxpriv) {
xf86OutputDestroy(output);
diff --git a/src/lx_panel.c b/src/lx_panel.c
index dedfaa8..8dfd68c 100644
--- a/src/lx_panel.c
+++ b/src/lx_panel.c
@@ -126,7 +126,7 @@ LXGetManualPanelMode(char *modestr)
if (ret != 9)
return NULL;
- mode = xnfcalloc(1, sizeof(DisplayModeRec));
+ mode = XNFcallocarray(1, sizeof(DisplayModeRec));
if (mode == NULL)
return NULL;