xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/r128_dri.c    |    6 +++---
 src/r128_probe.c  |    2 +-
 src/radeon_bios.c |    7 +++----
 src/radeon_crtc.c |    2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 9e5efdecd12092031a4aebce58747cb4a6f48f28
Author: Arkadiusz Miskiewicz <arekm at maven.pl>
Date:   Tue Dec 11 23:53:03 2007 -0500

    sparse fixes and cleanups from arekm

diff --git a/src/r128_dri.c b/src/r128_dri.c
index fc91421..edb77ba 100644
--- a/src/r128_dri.c
+++ b/src/r128_dri.c
@@ -80,9 +80,9 @@ static Bool R128InitVisualConfigs(ScreenPtr pScreen)
     ScrnInfoPtr       pScrn            = xf86Screens[pScreen->myNum];
     R128InfoPtr       info             = R128PTR(pScrn);
     int               numConfigs       = 0;
-    __GLXvisualConfig *pConfigs        = 0;
-    R128ConfigPrivPtr pR128Configs     = 0;
-    R128ConfigPrivPtr *pR128ConfigPtrs = 0;
+    __GLXvisualConfig *pConfigs        = NULL;
+    R128ConfigPrivPtr pR128Configs     = NULL;
+    R128ConfigPrivPtr *pR128ConfigPtrs = NULL;
     int               i, accum, stencil, db;
 
     switch (info->CurrentLayout.pixel_code) {
diff --git a/src/r128_probe.c b/src/r128_probe.c
index b2298df..0be21e8 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -193,7 +193,7 @@ R128Probe(DriverPtr drv, int flags)
  
         pScrn    = NULL;
         if((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
-             R128PciChipsets, 0, 0, 0, 0, 0)))
+             R128PciChipsets, NULL, NULL, NULL, NULL, NULL)))
 	{
 	    pScrn->driverVersion = R128_VERSION_CURRENT;
 	    pScrn->driverName    = R128_DRIVER_NAME;
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index bc908b5..d150c4b 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -48,13 +48,12 @@ Bool RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10)
     int tmp;
     unsigned short dptr;
 
-    if (!(info->VBIOS = xalloc(
 #ifdef XSERVER_LIBPCIACCESS
-			       info->PciInfo->rom_size
+    info->VBIOS = xalloc(info->PciInfo->rom_size);
 #else
-			       RADEON_VBIOS_SIZE
+    info->VBIOS = xalloc(RADEON_VBIOS_SIZE);
 #endif
-			       ))) {
+    if (!info->VBIOS) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		   "Cannot allocate space for hold Video BIOS!\n");
 	return FALSE;
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 8984428..2023f40 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -637,7 +637,7 @@ RADEONComputePLL(RADEONPLLPtr pll,
     CARD32 best_error = 0xffffffff;
     CARD32 best_vco_diff = 1;
 
-    ErrorF("freq: %d\n", freq);
+    ErrorF("freq: %lu\n", freq);
 
     for (i = 0; post_divs[i]; i++) {
 	int post_div = post_divs[i];