Code style cleanup to make the map and unmap blocks more consistent

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

1 files changed, 20 insertions, 19 deletions

diff --git a/src/vesa.c b/src/vesa.c
index 5a0120c..23d9e14 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1260,27 +1260,28 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
     pScrn->fbOffset = pVesa->mapOff;
 
 #ifdef XSERVER_LIBPCIACCESS
-    if ((pVesa->mapPhys != 0xa0000) && (pVesa->pciInfo != NULL)) {
-	(void) pci_device_map_range(pVesa->pciInfo, pScrn->memPhysBase,
-				    pVesa->mapSize,
-				    (PCI_DEV_MAP_FLAG_WRITABLE
-				     | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
-				    & pVesa->base);
-    }
-    else
-	(void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
-	                             pVesa->mapSize,
-	                             PCI_DEV_MAP_FLAG_WRITABLE,
-	                             & pVesa->base);
-
-    if (pVesa->base) {
-	if (pVesa->mapPhys != 0xa0000)
-	    (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
+    if (pVesa->pciInfo != NULL) {
+	if (pVesa->mapPhys != 0xa0000) {
+	    (void) pci_device_map_range(pVesa->pciInfo, pScrn->memPhysBase,
+	                                pVesa->mapSize,
+				        (PCI_DEV_MAP_FLAG_WRITABLE
+				         | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
+				        & pVesa->base);
+
+	    if (pVesa->base)
+		(void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
+		                             PCI_DEV_MAP_FLAG_WRITABLE,
+		                             & pVesa->VGAbase);
+	}
+	else {
+	    (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
+	                                 pVesa->mapSize,
 	                                 PCI_DEV_MAP_FLAG_WRITABLE,
-	                                 & pVesa->VGAbase);
-	else
-	    pVesa->VGAbase = pVesa->base;
+	                                 & pVesa->base);
 
+	    if (pVesa->base)
+		pVesa->VGAbase = pVesa->base;
+	}
     }
 #else
     if (pVesa->mapPhys != 0xa0000 && pVesa->pEnt->location.type == BUS_PCI)