From 8da5b8da1bac0b446b99e0dbe8495ffac5400bc8 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 22 Jul 2025 19:43:06 +0200 Subject: [PATCH] xfree86: drivers: cirrus: use void* instead `pointer` Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/drivers/video/cirrus/src/cir_driver.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/drivers/video/cirrus/src/cir_driver.c b/hw/xfree86/drivers/video/cirrus/src/cir_driver.c index 032c874a52..d30a00d90f 100644 --- a/hw/xfree86/drivers/video/cirrus/src/cir_driver.c +++ b/hw/xfree86/drivers/video/cirrus/src/cir_driver.c @@ -120,8 +120,7 @@ static XF86ModuleVersionInfo cirVersRec = */ _X_EXPORT XF86ModuleData cirrusModuleData = { &cirVersRec, cirSetup, NULL }; -static pointer -cirSetup(pointer module, pointer opts, int *errmaj, int *errmin) +static void* cirSetup(void *module, void *opts, int *errmaj, int *errmin) { static Bool setupDone = FALSE; @@ -131,7 +130,7 @@ cirSetup(pointer module, pointer opts, int *errmaj, int *errmin) setupDone = TRUE; xf86AddDriver(&CIRRUS, module, 0); - return (pointer)1; + return (void*)1; } if (errmaj) *errmaj = LDR_ONCEONLY; return NULL; @@ -351,17 +350,17 @@ CirUnmapMem(CirPtr pCir, int scrnIndex) * Unmap IO registers to virtual address space */ #ifndef XSERVER_LIBPCIACCESS - xf86UnMapVidMem(scrnIndex, (pointer)pCir->IOBase, pCir->IoMapSize); + xf86UnMapVidMem(scrnIndex, pCir->IOBase, pCir->IoMapSize); #else - pci_device_unmap_range(pCir->PciInfo, (pointer)pCir->IOBase, pCir->IoMapSize); + pci_device_unmap_range(pCir->PciInfo, pCir->IOBase, pCir->IoMapSize); #endif pCir->IOBase = NULL; } #ifndef XSERVER_LIBPCIACCESS - xf86UnMapVidMem(scrnIndex, (pointer)pCir->FbBase, pCir->FbMapSize); + xf86UnMapVidMem(scrnIndex, pCir->FbBase, pCir->FbMapSize); #else - pci_device_unmap_range(pCir->PciInfo, (pointer)pCir->FbBase, pCir->FbMapSize); + pci_device_unmap_range(pCir->PciInfo, pCir->FbBase, pCir->FbMapSize); #endif pCir->FbBase = NULL; return TRUE;