From patchwork Fri Nov 6 15:08:42 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: 7576251 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 D50249F36A for ; Sat, 7 Nov 2015 18:38:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C5EB20553 for ; Sat, 7 Nov 2015 18:38:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 41F2C2067A for ; Sat, 7 Nov 2015 18:38:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BD0B6E458; Sat, 7 Nov 2015 10:38:21 -0800 (PST) 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.17.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC21A6EBCB for ; Fri, 6 Nov 2015 07:08:48 -0800 (PST) Received: from [192.168.1.2] ([78.49.86.198]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0Lm4lR-1aU3W12BI9-00ZeZZ; Fri, 06 Nov 2015 16:08:44 +0100 Subject: [PATCH] GPU-DRM-vc4: 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> To: dri-devel@lists.freedesktop.org, David Airlie From: SF Markus Elfring Message-ID: <563CC27A.7020804@users.sourceforge.net> Date: Fri, 6 Nov 2015 16:08:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> X-Provags-ID: V03:K0:JnHjD3lHNx3JIoH75I8w4Ftq3Dyp+AAOqQHbLR+vjgzNjuf5SEO L0T0FKtbKI1kOQNLpQtE3khNlfbR4BbMvKWLrHKaUy2Bkm6n8PMVqJCjfmo0bQB3+n0oKlJ rGCqa2wOqpeLN/mswf3stFaFS65jzlcznF97icNPpBdZ2XTr7mwHafCHbOWKWmcgb+pBwmv Z9pnknb4/4HrNBlOwjkBQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:/tkHfgVCEh0=:0WVdbjZk9RCfXYliGGBrvm yZSjezsrcpolaYxB3t8KOMta6AoHEzcxPDS9zMyvYOtUK4ZY8IKA+08Teav+bhpPkvj9E2G+i x5GpW6Ef866KA0fSe+os1ldopRazisyw7zBbJD7IzeIE+ulGHaG3uOYkSKQ56AbKN4IxwE2rI HcJ34vR7BDXxmq7sgJDB8HG4OTwiIPxwhbah0XNjmlnLg+476atcLJ4PtO5vKXF1EXyZa3+pn FHK1fIudKItwdo5VxgC5dqXUk24DSWgNaYvPUGV2ZoxTR8spopxmxgbjV5Xy8ObJmPrY4hL1L aeq5HAeJJuSt2EhXYGlmH0iMtGsPTMEkWRHp5oMtnhR+yLltjncpRqirTiGvBlU3oFEl1Gdpq R68AZSgTDQIc3PlFYJfs07bPThfRBBtnApGhEFRHCwYs5Hbkt8vQzIfS3YDulXcpl7laY79o2 h/piFlQeh1CADY6yLX8NTILZMltYDPEEL1brXWr7rwvtn3JS77kB7y9efAZd0gadpblIP2c8P Mccg/MHhKSYeRzMIQ6zdDqjHWt+hdIQ5/grffgcCkK5w9pdeYShzUEbtjYDXBjBxMdBNFfBQl iQDeA/BsR7fvlnO1p32oC01f9Yke8769zTERpS7Ht3RqucYKMCs7/LtdK++ihivz0s7cJAidv 7ZwXF6Yep+yV0h5dAPtfmHG2xZihMieJ1Q7Z9QC2BtBawgGPEtE0K1peZln6Y1nj8qB2nUBCr i8QqhsAYoyqGkUHQ7GDm105mOxnuB0J73WmK2fXkhgrfrEtvqVjD/qld16aLcIyaV2lTGrXbD /4kcWE/ X-Mailman-Approved-At: Sat, 07 Nov 2015 10:38:13 -0800 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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: Fri, 6 Nov 2015 16:04:22 +0100 The following functions test whether their argument is NULL and then return immediately. * drm_fbdev_cma_hotplug_event * drm_fbdev_cma_restore_mode Thus the tests around their calls are not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/vc4/vc4_drv.c | 3 +-- drivers/gpu/drm/vc4/vc4_kms.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 6e73060..df348c0 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -54,8 +54,7 @@ static void vc4_lastclose(struct drm_device *dev) { struct vc4_dev *vc4 = to_vc4_dev(dev); - if (vc4->fbdev) - drm_fbdev_cma_restore_mode(vc4->fbdev); + drm_fbdev_cma_restore_mode(vc4->fbdev); } static const struct file_operations vc4_drm_fops = { diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 2e5597d..1778203 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -25,8 +25,7 @@ static void vc4_output_poll_changed(struct drm_device *dev) { struct vc4_dev *vc4 = to_vc4_dev(dev); - if (vc4->fbdev) - drm_fbdev_cma_hotplug_event(vc4->fbdev); + drm_fbdev_cma_hotplug_event(vc4->fbdev); } static const struct drm_mode_config_funcs vc4_mode_funcs = {