xserver: Branch 'master' - 2 commits

[Adam Jackson]

 hw/xfree86/common/xf86Init.c |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit b99fc65b53769400821a2bd8f691ece35a5b8847
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 19 15:06:53 2008 -0400

    Simplify calling xf86EnableIO() a bit.

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 9a9ec34..cb7b898 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -730,11 +730,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
     }
 
     /* Enable full I/O access */
-    if (xorgHWAccess) {
-	if(!xf86EnableIO())
-	    /* oops, we have failed */
-	    xorgHWAccess = FALSE;
-    }
+    if (xorgHWAccess)
+	xorgHWAccess = xf86EnableIO();
 
     /*
      * Locate bus slot that had register IO enabled at server startup
commit b1f2c7a89ace1f6e5750783f3c43c4c5a6d24374
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 19 15:06:11 2008 -0400

    The ->Identify hook is not mandatory.
    
    Best comment ever though.  Mad props.

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0db6776..9a9ec34 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -716,14 +716,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 
     for (i = 0; i < xf86NumDrivers; i++) {
 	xorgHWFlags flags;
-      /* The Identify function is mandatory, but if it isn't there continue */
+
 	if (xf86DriverList[i]->Identify != NULL)
 	    xf86DriverList[i]->Identify(0);
-	else {
-	    xf86Msg(X_WARNING, "Driver `%s' has no Identify function\n",
-		  xf86DriverList[i]->driverName ? xf86DriverList[i]->driverName
-					     : "noname");
-	}
+
 	if (!xorgHWAccess
 	    && (!xf86DriverList[i]->driverFunc
 		|| !xf86DriverList[i]->driverFunc(NULL,