xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit edd276185d42962a13faf9ec9eeebc754ef284e7
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Dec 15 12:42:44 2016 +0900

    Simplify drmmode_handle_uevents
    
    No functional change intended.
    
    Reviewed-by: Jim Qu <Jim.Qu at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index a5b4345..63b3b07 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2528,21 +2528,15 @@ static void drmmode_handle_uevents(int fd, void *closure)
 	ScrnInfoPtr scrn = drmmode->scrn;
 	struct udev_device *dev;
 	Bool received = FALSE;
-	struct timeval tv;
+	struct timeval tv = { 0, 0 };
 	fd_set readfd;
-	int ret;
 
 	FD_ZERO(&readfd);
 	FD_SET(fd, &readfd);
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
 
-	while (1) {
-		ret = select(fd + 1, &readfd, NULL, NULL, &tv);
-		/* Check if our file descriptor has received data. */
-		if (!(ret > 0 && FD_ISSET(fd, &readfd)))
-			break;
-		/* Make the call to receive device. select() ensured that this will not be blocked. */
+	while (select(fd + 1, &readfd, NULL, NULL, &tv) > 0 &&
+	       FD_ISSET(fd, &readfd)) {
+		/* select() ensured that this will not block */
 		dev = udev_monitor_receive_device(drmmode->uevent_monitor);
 		if (dev) {
 			udev_device_unref(dev);