diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 718f4eb..6a48655 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -245,7 +245,7 @@ static Bool AMDGPUGetRec(ScrnInfoPtr pScrn)
 	if (pScrn->driverPrivate)
 		return TRUE;
 
-	pScrn->driverPrivate = xnfcalloc(sizeof(AMDGPUInfoRec), 1);
+	pScrn->driverPrivate = XNFcallocarray(sizeof(AMDGPUInfoRec), 1);
 	return TRUE;
 }
 
diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c
index b6c8312..3fc64b1 100644
--- a/src/amdgpu_probe.c
+++ b/src/amdgpu_probe.c
@@ -277,7 +277,7 @@ amdgpu_probe(ScrnInfoPtr pScrn, int entity_num,
 	pPriv = xf86GetEntityPrivate(pEnt->index, gAMDGPUEntityIndex);
 
 	if (!pPriv->ptr) {
-		pPriv->ptr = xnfcalloc(sizeof(AMDGPUEntRec), 1);
+		pPriv->ptr = XNFcallocarray(sizeof(AMDGPUEntRec), 1);
 		if (!pPriv->ptr)
 			goto error;
 
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 09d2b37..f7c6a3d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1936,7 +1936,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res
 	if (!crtc)
 		return 0;
 
-	drmmode_crtc = xnfcalloc(sizeof(drmmode_crtc_private_rec), 1);
+	drmmode_crtc = XNFcallocarray(sizeof(drmmode_crtc_private_rec), 1);
 	drmmode_crtc->mode_crtc =
 	    drmModeGetCrtc(pAMDGPUEnt->fd, mode_res->crtcs[num]);
 	drmmode_crtc->drmmode = drmmode;