From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965151AbbBDVZz (ORCPT ); Wed, 4 Feb 2015 16:25:55 -0500 Received: from mout.web.de ([212.227.17.11]:52953 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932213AbbBDVZw (ORCPT ); Wed, 4 Feb 2015 16:25:52 -0500 Message-ID: <54D28E5C.9040304@users.sourceforge.net> Date: Wed, 04 Feb 2015 22:25:48 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: David Airlie , dri-devel@lists.freedesktop.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] GPU-DRM-OMAP: 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> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:YGbeHqHmzZ62Sf6Tini5xSyXquNAlBZEms/sKXiYq9mX83wrqLd Fnt5X6KK/gdfLLJsQzTa0IIR6xIoTxXbMTiAXDDnICd3GXNRIrF8WpOoDXVloUPDWNnl3r7 4d2cv0Ps1nmjJhFq5vKti+Mrarc/Cmf172g34LHAFgdHqyRdIMh9soVn30hCkpK0qvzCVWZ OKWiPHVnZ9v8HsUF9P43g== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 4 Feb 2015 22:22:36 +0100 The functions framebuffer_release() and vunmap() perform also input parameter validation. Thus the test around their calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 +-- drivers/gpu/drm/omapdrm/omap_gem.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index d292d24..fcc02b0 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -270,8 +270,7 @@ fail_unlock: fail: if (ret) { - if (fbi) - framebuffer_release(fbi); + framebuffer_release(fbi); if (fb) { drm_framebuffer_unregister_private(fb); drm_framebuffer_remove(fb); diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index aeb91ed..18a4137 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -1292,12 +1292,11 @@ void omap_gem_free_object(struct drm_gem_object *obj) if (omap_obj->pages) omap_gem_detach_pages(obj); - if (!is_shmem(obj)) { + if (!is_shmem(obj)) dma_free_writecombine(dev->dev, obj->size, omap_obj->vaddr, omap_obj->paddr); - } else if (omap_obj->vaddr) { + else vunmap(omap_obj->vaddr); - } } /* don't free externally allocated syncobj */ -- 2.2.2