From patchwork Wed Jul 23 15:26:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 4611741 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 0D1759F4BD for ; Wed, 23 Jul 2014 15:30:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 532052017D for ; Wed, 23 Jul 2014 15:30:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 709DE201C0 for ; Wed, 23 Jul 2014 15:30:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A860D6E661; Wed, 23 Jul 2014 08:30:55 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 784176E65E for ; Wed, 23 Jul 2014 08:30:51 -0700 (PDT) Received: by mail-we0-f170.google.com with SMTP id w62so1339444wes.29 for ; Wed, 23 Jul 2014 08:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bp8y1eE6RZYeFsCI+1ZXGc/TH3EuGkUhU4ft35a6+AQ=; b=hmSHw3QpOUEHh/WSHqkRlZ9Cq+d9c3u0M4y6yGhChSJfdkXAjbtdomoFPI3PdWJ8M3 ucwrygd2oJeJcrPzHQniC54ZjUn/6cdSfPk03uIaK83bJ/Inf/nPlsFEnsI7bJp6mip2 SLEOFQ9+2gquKPJ5tb4lRfWMHYAo3nKtLxNYq9sTmgWUojQKoapp3OTTdC5p6Y60DlKL vDBdVlGX87nfYMvv8iXwcFKp/GiMLkGz/74k1Dk1b786zZUp/tbpbgFir8SWzvMCtvS+ qN3//0SCRysRbtjNEBoHe4keMgTejXiOJO9S6yeX2EQvOiN7dsMAokxNiH9ndyvIgTcO 6UWQ== X-Received: by 10.194.187.4 with SMTP id fo4mr2852478wjc.35.1406129447722; Wed, 23 Jul 2014 08:30:47 -0700 (PDT) Received: from david-tp.localdomain (stgt-5f71b1a8.pool.mediaWays.net. [95.113.177.168]) by mx.google.com with ESMTPSA id bx2sm7092580wjb.47.2014.07.23.08.30.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Jul 2014 08:30:45 -0700 (PDT) From: David Herrmann To: dri-devel@lists.freedesktop.org Subject: [PATCH 06/12] drm: fix __alpha__ PCI lookup Date: Wed, 23 Jul 2014 17:26:41 +0200 Message-Id: <1406129207-1302-7-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1406129207-1302-1-git-send-email-dh.herrmann@gmail.com> References: <1406129207-1302-1-git-send-email-dh.herrmann@gmail.com> Cc: Daniel Vetter 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Testing the return value of list_entry() for NULL is a no-op (as it is just a fancy container_of() / offsetof()). Drop the superfluous if-clause and instead verify the actual root-node is available. This is probably what it was meant to test for from the beginning, anyway. Signed-off-by: David Herrmann --- drivers/gpu/drm/drm_fops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index a402061..afba0bf 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -330,11 +330,11 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor) dev->hose = pci_dev->sysdata; pci_dev_put(pci_dev); } - if (!dev->hose) { + + if (!dev->hose && pci_root_buses.next) { struct pci_bus *b = list_entry(pci_root_buses.next, - struct pci_bus, node); - if (b) - dev->hose = b->sysdata; + struct pci_bus, node); + dev->hose = b->sysdata; } } #endif