v2: Remove the handler function instead of commenting out split debugmsg function removal to a separate patch
Signed-off-by: Jan Vesely jan.vesely@rutgers.edu --- tests/drmstat.c | 13 ------------- xf86drm.c | 2 ++ 2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/tests/drmstat.c b/tests/drmstat.c index c6ff1ff..c800ebb 100644 --- a/tests/drmstat.c +++ b/tests/drmstat.c @@ -81,11 +81,6 @@ static void getversion(int fd) printf( "No driver available\n" ); } } - -void handler(int fd, void *oldctx, void *newctx) -{ - printf("Got fd %d\n", fd); -}
static void process_sigio(char *device) { @@ -97,7 +92,6 @@ static void process_sigio(char *device) }
sigio_fd = fd; - /* drmInstallSIGIOHandler(fd, handler); */ for (;;) sleep(60); }
@@ -427,11 +421,4 @@ int main(int argc, char **argv) return r; }
-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 5032f35..a309d57 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -277,6 +277,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; @@ -292,6 +293,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.