c72d21a
From 886a3a8bba89134c16661ba81256735d7933ec7b Mon Sep 17 00:00:00 2001
c72d21a
From: Hans de Goede <hdegoede@redhat.com>
c72d21a
Date: Tue, 27 Sep 2016 14:30:10 +0200
c72d21a
Subject: [PATCH xserver v2 4/7] xfree86: Remove redundant ServerIsNotSeat0
c72d21a
 check from xf86CallDriverProbe
c72d21a
c72d21a
If foundScreen is TRUE, then all the code below the removed if
c72d21a
will not execute until we reach the return foundScreen; at the
c72d21a
end, so this entire if block is redundant.
c72d21a
c72d21a
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
c72d21a
---
c72d21a
 hw/xfree86/common/xf86Bus.c | 2 --
c72d21a
 1 file changed, 2 deletions(-)
c72d21a
c72d21a
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
c72d21a
index 5b93940..27c6b1b 100644
c72d21a
--- a/hw/xfree86/common/xf86Bus.c
c72d21a
+++ b/hw/xfree86/common/xf86Bus.c
c72d21a
@@ -82,8 +82,6 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
c72d21a
     if (!xf86DoConfigure && drv->platformProbe != NULL) {
c72d21a
         foundScreen = xf86platformProbeDev(drv);
c72d21a
     }
c72d21a
-    if (ServerIsNotSeat0() && foundScreen)
c72d21a
-        return foundScreen;
c72d21a
 #endif
c72d21a
 
c72d21a
 #ifdef XSERVER_LIBPCIACCESS
c72d21a
-- 
c72d21a
2.9.3
c72d21a