From 8980f8c1eaf965e6d4c9a3e894596b3b0ec01120 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 8 Jun 2017 21:52:50 +0200 Subject: [PATCH] Get rid of useless wrapper function epoll_waiting --- input/common/epoll_common.c | 5 ----- input/common/epoll_common.h | 2 -- input/drivers/udev_input.c | 2 +- input/drivers_joypad/linuxraw_joypad.c | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/input/common/epoll_common.c b/input/common/epoll_common.c index 0caffc10c8..9fb3d54bf9 100644 --- a/input/common/epoll_common.c +++ b/input/common/epoll_common.c @@ -43,11 +43,6 @@ void epoll_free(int *epoll_fd) *epoll_fd = -1; } -int epoll_waiting(int *epoll_fd, void *events, int maxevents, int timeout) -{ - return epoll_wait(*epoll_fd, (struct epoll_event*)events, maxevents, timeout); -} - bool epoll_add(int *epoll_fd, int fd, void *device) { struct epoll_event event; diff --git a/input/common/epoll_common.h b/input/common/epoll_common.h index ae0b3c087a..8351b14989 100644 --- a/input/common/epoll_common.h +++ b/input/common/epoll_common.h @@ -24,8 +24,6 @@ bool epoll_new(int *epoll_fd); void epoll_free(int *epoll_fd); -int epoll_waiting(int *epoll_fd, void *events, int maxevents, int timeout); - bool epoll_add(int *epoll_fd, int fd, void *device); #endif diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index e2ef48c8af..d7489fa80a 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -492,7 +492,7 @@ static void udev_input_poll(void *data) while (udev->monitor && hotplug_avail) udev_input_handle_hotplug(udev); - ret = epoll_waiting(&udev->epfd, events, ARRAY_SIZE(events), 0); + ret = epoll_wait(udev->epfd, events, ARRAY_SIZE(events), 0); for (i = 0; i < ret; i++) { diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c index c9b602cdc0..f1d33f5c15 100644 --- a/input/drivers_joypad/linuxraw_joypad.c +++ b/input/drivers_joypad/linuxraw_joypad.c @@ -128,7 +128,7 @@ static void linuxraw_joypad_poll(void) struct epoll_event events[MAX_USERS + 1]; retry: - ret = epoll_waiting(&linuxraw_epoll, events, MAX_USERS + 1, 0); + ret = epoll_wait(linuxraw_epoll, events, MAX_USERS + 1, 0); if (ret < 0 && errno == EINTR) goto retry;