From 9c927463492dea14d82ebdd77f711f86b0e6fc5e Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 17 Jun 2015 11:28:49 -0500 Subject: loader: Rename drm_open_device() to loader_open_device() and share it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is already our common idiom for opening files with CLOEXEC and it's a little ugly, so let's share this one implementation. Signed-off-by: Derek Foreman Reviewed-by: Kristian Høgsberg Reviewed-by: Emil Velikov --- src/loader/loader.c | 6 +++--- src/loader/loader.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/loader') diff --git a/src/loader/loader.c b/src/loader/loader.c index 17bf1336005..fc468153425 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -314,8 +314,8 @@ get_id_path_tag_from_fd(struct udev *udev, int fd) return id_path_tag; } -static int -drm_open_device(const char *device_name) +int +loader_open_device(const char *device_name) { int fd; #ifdef O_CLOEXEC @@ -404,7 +404,7 @@ int loader_get_user_preferred_fd(int default_fd, int *different_device) goto default_device_clean; } - fd = drm_open_device(device_name); + fd = loader_open_device(device_name); if (fd >= 0) { close(default_fd); } else { diff --git a/src/loader/loader.h b/src/loader/loader.h index 60c58f2f8fc..055dc786892 100644 --- a/src/loader/loader.h +++ b/src/loader/loader.h @@ -36,6 +36,9 @@ extern "C" { #define _LOADER_DRI (1 << 0) #define _LOADER_GALLIUM (1 << 1) +int +loader_open_device(const char *); + int loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id); -- cgit v1.2.3