From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752798AbbGESXE (ORCPT ); Sun, 5 Jul 2015 14:23:04 -0400 Received: from mout.web.de ([212.227.15.4]:60754 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751556AbbGESWx (ORCPT ); Sun, 5 Jul 2015 14:22:53 -0400 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 CC: Linux Kernel Mailing List , kernel-janitors@vger.kernel.org, Julia Lawall 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> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); } -- 2.4.5