From: Emil Velikov Date: Wed, 8 Aug 2018 14:05:56 +0000 (+0100) Subject: egl/android: remove droid_probe_driver() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d1211f3112c0e7c710a380ddc0887a44f461e1bb;p=mesa.git egl/android: remove droid_probe_driver() The function name is misleading - it effectively checks if loader_get_driver_for_fd fails. Which can happen only only on strdup error - a close to impossible scenario. Drop the function - we call the loader API at at later stage. Signed-off-by: Emil Velikov Reviewed-by: Tomasz Figa --- diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index ee6c2791b18..de53376c9fc 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1404,19 +1404,6 @@ error: return false; } -static bool -droid_probe_driver(int fd) -{ - char *driver_name; - - driver_name = loader_get_driver_for_fd(fd); - if (driver_name == NULL) - return false; - - free(driver_name); - return true; -} - typedef enum { probe_fail = -1, probe_success = 0, @@ -1442,11 +1429,6 @@ droid_probe_device(_EGLDisplay *disp, int fd, const char *vendor) goto cleanup; } - if (!droid_probe_driver(fd)) { - ret = probe_fail; - goto cleanup; - } - ret = probe_success; cleanup: