From patchwork Sun Jul 5 18:22:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 6719031 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1B31F9F2F0 for ; Mon, 6 Jul 2015 01:20:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48FBA20652 for ; Mon, 6 Jul 2015 01:20:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id ABF1E2063D for ; Mon, 6 Jul 2015 01:20:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F04CA6E47D; Sun, 5 Jul 2015 18:20:53 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.web.de (mout.web.de [212.227.15.4]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77C3F6E09B for ; Sun, 5 Jul 2015 11:22:51 -0700 (PDT) Received: from [192.168.1.2] ([78.49.236.106]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0MgIMg-1ZQZii3Rzy-00NjCa; Sun, 05 Jul 2015 20:22:46 +0200 Message-ID: <559975EB.500@users.sourceforge.net> Date: Sun, 05 Jul 2015 20:22:35 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH] GPU-DRM-nouveau: Delete unnecessary checks before two function calls References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5447BF71.7040200@users.sourceforge.net> In-Reply-To: <5447BF71.7040200@users.sourceforge.net> X-Provags-ID: V03:K0:VjwI1TAMnrvzb7jEgpYP6IULHLr9mHKyE8vWMZ8twEazNKF/p1N HNHFP6otCDvh9450vZK5vbklc1noJZAdTIy+z68W4cKYBNJPDdx41ZbRbhr2yLiNHJy1H1k GVpyMimLACmh07oCJo1NHdwpSofBfObnY9rMQmKkqzqP6ySvTpavQZwbJENujodclAzcbIy uG708ZZYunLAq9zBQCgUg== X-UI-Out-Filterresults: notjunk:1; V01:K0:cLSRC+HXiyk=:uvnYNdeOXF5nVliCNz1RNp 4o/nPb6GwzJkvnVTnLtFpitbG9FafJCV2LSjal3TPFg98ViM0O6C0Ui6IQWRlxk4EDBtCjdn/ Ce7f3/SCz2JJ49KiiMfo4SBy36E0S7cUbUW0xDLUwCYI/Gefcepjf3jOqXKWLcAmvos+Bec/q 2443MY3n/Fwp1f1TBxms40u8Yo4yKgcpG64Nkb+A/1NYmsNWLQjygO998ZovezWGmD4QHu08D QDi4QRw93a461u/4PO8SGpBYKn6I3I+PfT5ss2tHepc1nKW4Hw5jv5GCfTtUcNChZfrXaHrwT bx0kjuxsQAU5FyrLm2cacXaff46g+9GqH1sZQqj21UDUhJzgL2hqf7k9Rx294NMpHINU0SsJ4 hwCToPyPjOrIRiWIwMBt2SDPSrzhHDpciCA/iNtJkwbCVO9oJ8+U98LgswOiyE9ImP5LkEMz0 vOCGUU9Zd1lqYPsImUWtXcpTQwNOJRThUJNG1uzRoae6jgF/sGVdMR6WpkdgFExemtxdectgI +jiNU1jack672W8zTTbrzuGJS6v02eI+nNEbBOiQDOIVWaJEYrXwvedbd+1jjEga4fQxAFdQQ OMnqixC/kqtY1y9iYLFs4M3bRcS/unRj2zB5RTUzp8aUjGnqOIwCLEsL5hfZgjyEwgVUK35SB gh6cILW1sJQpy+6w9wPi8KmwZtvbGcelG7UU33hLsh2Bd1GfopJv6QRHKUCDqJZsA0Aw= X-Mailman-Approved-At: Sun, 05 Jul 2015 18:20:52 -0700 Cc: Julia Lawall , kernel-janitors@vger.kernel.org, Linux Kernel Mailing List X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 From: Markus Elfring Date: Sun, 5 Jul 2015 20:15:12 +0200 The functions nvkm_namedb_put() and pci_dev_put() test whether their argument is NULL and then return immediately. Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +-- drivers/gpu/drm/nouveau/nvkm/core/handle.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 36b40c9..8ca3d0c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -515,8 +515,7 @@ nouveau_drm_unload(struct drm_device *dev) nouveau_vga_fini(drm); nvif_device_fini(&drm->device); - if (drm->hdmi_device) - pci_dev_put(drm->hdmi_device); + pci_dev_put(drm->hdmi_device); nouveau_cli_destroy(&drm->client); return 0; } diff --git a/drivers/gpu/drm/nouveau/nvkm/core/handle.c b/drivers/gpu/drm/nouveau/nvkm/core/handle.c index dc7ff10..165f3ff 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/handle.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/handle.c @@ -216,6 +216,5 @@ nvkm_handle_get_cinst(struct nvkm_object *engctx, u32 cinst) void nvkm_handle_put(struct nvkm_handle *handle) { - if (handle) - nvkm_namedb_put(handle); + nvkm_namedb_put(handle); }