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