summaryrefslogtreecommitdiff
path: root/xf86drm.c
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2014-04-17 12:08:01 +0800
committerThierry Reding <treding@nvidia.com>2014-05-13 12:14:19 +0200
commit305478ce02ebd908a75c9830ecea15f6e2469b42 (patch)
tree9813f8a116f59770e080e31ccfa106e5e64ac524 /xf86drm.c
parentee87b4716d416be94071eea5dd67a22d1e78df31 (diff)
drmOpenByName: remove redundant drmAvailable check
drmOpenByName() is a static function that is only called by drmOpen(). drmOpen() already checks drmAvailable(), so the check in drmOpenByName() is redundant. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'xf86drm.c')
-rw-r--r--xf86drm.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/xf86drm.c b/xf86drm.c
index e94f2cd0..85beb8c2 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -541,19 +541,6 @@ static int drmOpenByName(const char *name)
int fd;
drmVersionPtr version;
char * id;
-
- if (!drmAvailable()) {
- if (!drm_server_info) {
- return -1;
- }
- else {
- /* try to load the kernel module now */
- if (!drm_server_info->load_module(name)) {
- drmMsg("[drm] failed to load kernel module \"%s\"\n", name);
- return -1;
- }
- }
- }
/*
* Open the first minor number that matches the driver name and isn't