Mesa (master): loader: drop empty function alias

Eric Engeström eric_engestrom at kemper.freedesktop.org
Thu Oct 26 15:27:37 UTC 2017


Module: Mesa
Branch: master
Commit: 109de3049dda6be2a5a3910f777feea0bbf9ce92
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=109de3049dda6be2a5a3910f777feea0bbf9ce92

Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date:   Thu Oct 26 15:37:49 2017 +0100

loader: drop empty function alias

While at it, drop the duplicate return.

Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Emil Velikov <emli.velikov at collabora.com>

---

 src/loader/loader.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/loader/loader.c b/src/loader/loader.c
index f7f85e37c2..3c67f9dc24 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -284,24 +284,15 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
    return 0;
 }
 
-
-#if defined(HAVE_LIBDRM)
-static char *
-drm_get_device_name_for_fd(int fd)
-{
-   return drmGetDeviceNameFromFd2(fd);
-}
-#endif
-
 char *
 loader_get_device_name_for_fd(int fd)
 {
    char *result = NULL;
 
 #if HAVE_LIBDRM
-   if ((result = drm_get_device_name_for_fd(fd)))
-      return result;
+   result = drmGetDeviceNameFromFd2(fd);
 #endif
+
    return result;
 }
 




More information about the mesa-commit mailing list