Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
---
 tests/drmstat.c | 9 ++-------
 xf86drm.c       | 8 ++------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tests/drmstat.c b/tests/drmstat.c
index 36cc70d..6502d78 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -82,10 +82,12 @@ static void getversion(int fd)
     }
 }

+/*
 static void handler(int fd, void *oldctx, void *newctx)
 {
     printf("Got fd %d\n", fd);
 }
+*/

 static void process_sigio(char *device)
 {
@@ -427,11 +429,4 @@ int main(int argc, char **argv)
     return r; 
 }

-static void DRM_PRINTFLIKE(4, 0)
-xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format,
-                va_list args)
-{
-       vfprintf(stderr, format, args);
-}
-
 int xf86ConfigDRI[10];
diff --git a/xf86drm.c b/xf86drm.c
index 3c8fc0b..a660842 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -131,12 +131,6 @@ drmMsg(const char *format, ...)
     }
 }

-static void
-drmSetDebugMsgFunction(debug_msg_func_t debug_msg_ptr)
-{
-    drm_debug_print = debug_msg_ptr;
-}
-
 static void *drmHashTable = NULL; /* Context switch callbacks */

 void *drmGetHashTable(void)
@@ -272,6 +266,7 @@ static int drmMatchBusID(const char *id1, const char *id2, 
int pci_domain_ok)
  * If any other failure happened then it will output error mesage using
  * drmMsg() call.
  */
+#if !defined(UDEV)
 static int chown_check_return(const char *path, uid_t owner, gid_t group)
 {
        int rv;
@@ -287,6 +282,7 @@ static int chown_check_return(const char *path, uid_t 
owner, gid_t group)
                        path, errno, strerror(errno));
        return -1;
 }
+#endif

 /**
  * Open the DRM device, creating it if necessary.
-- 
2.1.0

Reply via email to