From 47f94633fe3c1be3f9012a017bf01a1c52f2fe73 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 18 Mar 2024 09:51:49 +1000 Subject: [PATCH] test: remove some old compat code for kernel<4.5 Kernel 4.5 and libevdev 1.5 were released in 2016, this code is no longer necessary. Part-of: --- test/litest.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/test/litest.c b/test/litest.c index dd3498ff..bd2be3e0 100644 --- a/test/litest.c +++ b/test/litest.c @@ -3396,7 +3396,7 @@ litest_create_uinput(const char *name, struct libevdev_uinput *uinput; struct libevdev *dev; int type, code; - int rc, fd; + int rc; const struct input_absinfo *abs; const struct input_absinfo default_abs = { .value = 0, @@ -3407,7 +3407,6 @@ litest_create_uinput(const char *name, .resolution = 100 }; char buf[512]; - const char *devnode; dev = libevdev_new(); litest_assert_ptr_notnull(dev); @@ -3452,38 +3451,6 @@ litest_create_uinput(const char *name, libevdev_free(dev); - devnode = libevdev_uinput_get_devnode(uinput); - litest_assert_notnull(devnode); - fd = open(devnode, O_RDONLY); - litest_assert_int_gt(fd, -1); - rc = libevdev_new_from_fd(fd, &dev); - litest_assert_int_eq(rc, 0); - - /* uinput before kernel 4.5 + libevdev 1.5.0 does not support - * setting the resolution, so we set it afterwards. This is of - * course racy as hell but the way we _generally_ use this function - * by the time libinput uses the device, we're finished here. - * - * If you have kernel 4.5 and libevdev 1.5.0 or later, this code - * just keeps the room warm. - */ - abs = abs_info; - while (abs && abs->value != -1) { - if (abs->resolution != 0) { - if (libevdev_get_abs_resolution(dev, abs->value) == - abs->resolution) - break; - - rc = libevdev_kernel_set_abs_info(dev, - abs->value, - abs); - litest_assert_int_eq(rc, 0); - } - abs++; - } - close(fd); - libevdev_free(dev); - return uinput; }