From 83ed3e12c4219016dd5e20cdfe328cb873421033 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 21 May 2025 11:06:00 +0200
Subject: [PATCH] xfree86: xf86.h: drop xf86GetVidModeEnabled()

Not used externally, and not actually necessary - we can use the
xf86Info.vidModeEnabled field directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86.h        | 2 --
 hw/xfree86/common/xf86Helper.c  | 6 ------
 hw/xfree86/common/xf86VidMode.c | 4 ++--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index f890d7099..141440746 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -249,8 +249,6 @@ xf86ServerIsExiting(void);
 extern _X_EXPORT Bool
 xf86ServerIsOnlyDetecting(void);
 extern _X_EXPORT Bool
-xf86GetVidModeEnabled(void);
-extern _X_EXPORT Bool
 xf86GetAllowMouseOpenFail(void);
 extern _X_EXPORT CARD32
 xorgGetVersion(void);
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 97dfcbc44..8393491c4 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1383,12 +1383,6 @@ xf86ServerIsOnlyDetecting(void)
     return xf86DoConfigure;
 }
 
-Bool
-xf86GetVidModeEnabled(void)
-{
-    return xf86Info.vidModeEnabled;
-}
-
 Bool
 xf86GetAllowMouseOpenFail(void)
 {
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index 21e0c4ab0..a248bd841 100644
--- a/hw/xfree86/common/xf86VidMode.c
+++ b/hw/xfree86/common/xf86VidMode.c
@@ -400,7 +400,7 @@ xf86VidModeInit(ScreenPtr pScreen)
 {
     VidModePtr pVidMode;
 
-    if (!xf86GetVidModeEnabled()) {
+    if (!xf86Info.vidModeEnabled) {
         DebugF("!xf86GetVidModeEnabled()\n");
         return FALSE;
     }
@@ -448,7 +448,7 @@ XFree86VidModeExtensionInit(void)
     DebugF("XFree86VidModeExtensionInit");
 
     /* This means that the DDX doesn't want the vidmode extension enabled */
-    if (!xf86GetVidModeEnabled())
+    if (!xf86Info.vidModeEnabled)
         return;
 
     for (i = 0; i < screenInfo.numScreens; i++) {