summaryrefslogtreecommitdiff
path: root/hw/xfree86/common
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2018-08-01 13:49:52 -0700
committerAdam Jackson <ajax@redhat.com>2018-08-02 10:27:37 -0400
commitaccd32a466a1a87ab45b5422dff2ef5a9c867049 (patch)
treed6e96295a5f9445553530673638134f4a6d046a3 /hw/xfree86/common
parent708ddfbda1391468d66957e247f51854b39db5fa (diff)
xorg: Remove the XF86PM define.
We already have pm_noop.c being built most of the time for the no-OS-PM case, so just switch to always using it. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xfree86/common')
-rw-r--r--hw/xfree86/common/xf86Events.c6
-rw-r--r--hw/xfree86/common/xf86Init.c8
2 files changed, 0 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 8a800bd8f..455a0eccb 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -86,9 +86,7 @@
#include "xf86platformBus.h"
#include "systemd-logind.h"
-#ifdef XF86PM
extern void (*xf86OSPMClose) (void);
-#endif
static void xf86VTSwitch(void);
@@ -396,11 +394,9 @@ xf86VTLeave(void)
if (!xf86VTSwitchAway())
goto switch_failed;
-#ifdef XF86PM
if (xf86OSPMClose)
xf86OSPMClose();
xf86OSPMClose = NULL;
-#endif
for (i = 0; i < xf86NumScreens; i++) {
/*
@@ -456,9 +452,7 @@ xf86VTEnter(void)
if (!xf86VTSwitchTo())
return;
-#ifdef XF86PM
xf86OSPMClose = xf86OSPMOpen();
-#endif
if (xorgHWAccess)
xf86EnableIO();
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 3c5cc7097..8773a47e8 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -92,9 +92,7 @@
#endif
#include <hotplug.h>
-#ifdef XF86PM
void (*xf86OSPMClose) (void) = NULL;
-#endif
static Bool xorgHWOpenConsole = FALSE;
/* Common pixmap formats */
@@ -397,9 +395,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
}
}
-#ifdef XF86PM
xf86OSPMClose = xf86OSPMOpen();
-#endif
xf86ExtensionInit();
@@ -626,7 +622,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (xorgHWOpenConsole)
xf86OpenConsole();
-#ifdef XF86PM
/*
should we reopen it here? We need to deal with an already opened
device. We could leave this to the OS layer. For now we simply
@@ -636,7 +631,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
xf86OSPMClose();
if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
-#endif
/* Make sure full I/O access is enabled */
if (xorgHWAccess)
@@ -878,11 +872,9 @@ ddxGiveUp(enum ExitCode error)
xf86VGAarbiterFini();
-#ifdef XF86PM
if (xf86OSPMClose)
xf86OSPMClose();
xf86OSPMClose = NULL;
-#endif
for (i = 0; i < xf86NumScreens; i++) {
/*