[PATCH 05/11] xfree86: bus: delete useless xf86FindPrimaryDevice

[Tiago Vignatti]

This function had a wrong name and was just logging the primary device. No one
cares about it honestly.

Signed-off-by: Tiago Vignatti <tiago.vigna...@nokia.com>
---
 hw/xfree86/common/xf86Bus.c       |   37 -------------------------------------
 hw/xfree86/common/xf86Configure.c |    2 --
 hw/xfree86/common/xf86Priv.h      |    4 ----
 3 files changed, 0 insertions(+), 43 deletions(-)

diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 943574a..7aa2540 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -111,10 +111,6 @@ xf86BusConfig(void)
     if (xorgHWAccess)
         xorgHWAccess = xf86EnableIO();
 
-    /* Locate bus slot that had register IO enabled at server startup */
-    if (xorgHWAccess)
-        xf86FindPrimaryDevice();
-
     /*
      * Now call each of the Probe functions.  Each successful probe will
      * result in an extra entry added to the xf86Screens[] list for each
@@ -557,39 +553,6 @@ xf86PostScreenInit(void)
     xf86EnterServerState(OPERATING);
 }
 
-/*
- * xf86FindPrimaryDevice() - Find the display device which
- * was active when the server was started.
- */
-void
-xf86FindPrimaryDevice(void)
-{
-    if (primaryBus.type != BUS_NONE) {
-       char *bus;
-       char loc[16];
-
-       switch (primaryBus.type) {
-       case BUS_PCI:
-           bus = "PCI";
-           snprintf(loc, sizeof(loc), " %2...@%2.2x:%2.2x:%1.1x",
-                    primaryBus.pci->bus,
-                    primaryBus.pci->domain,
-                    primaryBus.pci->dev,
-                    primaryBus.pci->func);
-           break;
-       case BUS_SBUS:
-           bus = "SBUS";
-           snprintf(loc, sizeof(loc), " %2.2x", primaryBus.sbus);
-           break;
-       default:
-           bus = "";
-           loc[0] = '\0';
-       }
-
-       xf86MsgVerb(X_INFO, 2, "Primary Device is: %s%s\n",bus,loc);
-    }
-}
-
 int
 xf86GetLastScrnFlag(int entityIndex)
 {
diff --git a/hw/xfree86/common/xf86Configure.c 
b/hw/xfree86/common/xf86Configure.c
index 3013321..2f93bb1 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -681,8 +681,6 @@ DoConfigure(void)
            xorgHWAccess = FALSE;
     }
 
-    xf86FindPrimaryDevice();
- 
     /* Create XF86Config file structure */
     xf86config = calloc(1, sizeof(XF86ConfigRec));
 
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index d2073ae..b5e7a45 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -110,14 +110,10 @@ extern _X_EXPORT  RootWinPropPtr 
*xf86RegisteredPropertiesTable;
 #ifndef _NO_XF86_PROTOTYPES
 
 /* xf86Bus.c */
-
 extern _X_EXPORT Bool xf86BusConfig(void);
 extern _X_EXPORT void xf86BusProbe(void);
 extern _X_EXPORT void xf86AccessEnter(void);
 extern _X_EXPORT void xf86AccessLeave(void);
-
-extern _X_EXPORT void xf86FindPrimaryDevice(void);
-/* new RAC */
 extern _X_EXPORT void xf86PostProbe(void);
 extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
 extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
-- 
1.6.0.4

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel