From patchwork Thu Apr 17 04:08:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kurtz X-Patchwork-Id: 4005621 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9A98A9F319 for ; Thu, 17 Apr 2014 04:08:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DAAF820200 for ; Thu, 17 Apr 2014 04:08:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 00BE3201E4 for ; Thu, 17 Apr 2014 04:08:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6046B6E4AE; Wed, 16 Apr 2014 21:08:15 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 9FC1A6E4AE for ; Wed, 16 Apr 2014 21:08:14 -0700 (PDT) Received: by mail-ve0-f174.google.com with SMTP id oz11so11893800veb.33 for ; Wed, 16 Apr 2014 21:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=2Ar6o1fUWpavfybktSJWs3ovEP7VU5UOB7yNaNJGx+k=; b=EeQaO6+b1jYNtv0W2JlkbqWhNNpGK1eTxZNyO3Bp83ahBVY9FqVULsan41bROh6LDv DiMrf5i8DhH3cfIhgkt56yPefFx2tZHHPVPFurp7m46TT0RKuZj5tylsSjB++WIEzSJa sgmFiW6YPIVrFQd8CAymSuGPvlthI5l6kqwq4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2Ar6o1fUWpavfybktSJWs3ovEP7VU5UOB7yNaNJGx+k=; b=CuA7zCo09d2J1e2rkbt51sv4X/EWcXYM6bPyZM+D4UDU6Y7zThi3OyPcDHNl9hgo/2 KV7TaAaVDB/F/4k1MmqF6ajqz3KT+3epXyuMaQfI7gFR7au5MxdeRB3D5W+1mn8ZQZ/2 FByWZgUZBF2Kdo8aoY2wVbZcYeSIFMjo9mR7MNjBu+WWfKvOSwmDe6QpwoLY1D4y3kjr bxjbzC5k7U6o+ZZT2bglyGUw1nDNwruVNVVyKH2k+D5BZklNo3FppvmvNWHebH8L7p1J Boai1I+elfjPM2nuJPWKT6awZNR0l0HouWA9cR+ofPiY1rscXzoqH2OuHkSIujL3W/lw D1Rg== X-Gm-Message-State: ALoCoQkVHDdikmzndizn0/y2RbuzuHKK5TitcbOFcXRgY44xpmQW8xemQ+sddm4r/o8ewVaCSeVm X-Received: by 10.58.1.97 with SMTP id 1mr5563645vel.23.1397707691895; Wed, 16 Apr 2014 21:08:11 -0700 (PDT) Received: from djkurtzt530-glaptop.corp.google.com ([203.208.61.193]) by mx.google.com with ESMTPSA id ee5sm49251078vdb.8.2014.04.16.21.08.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Apr 2014 21:08:10 -0700 (PDT) From: Daniel Kurtz To: Dave Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH] drmOpenByName: remove redundant drmAvailable check Date: Thu, 17 Apr 2014 12:08:01 +0800 Message-Id: <1397707681-27587-1-git-send-email-djkurtz@chromium.org> X-Mailer: git-send-email 1.9.1.423.g4596e3a X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP drmOpenByName() is a static function that is only called by drmOpen(). drmOpen() already checks drmAvailable(), so the checki in drmOpenByName() is redundant. Signed-off-by: Daniel Kurtz --- xf86drm.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/xf86drm.c b/xf86drm.c index 720952f..118022c 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -537,19 +537,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