From patchwork Sat Jun 27 21:23:10 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: 6686551 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 0645A9F1C1 for ; Sun, 28 Jun 2015 17:10:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C61E205DC for ; Sun, 28 Jun 2015 17:10:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 45ADA205DD for ; Sun, 28 Jun 2015 17:10:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DACDC6E20C; Sun, 28 Jun 2015 10:10:46 -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.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id F25CA6E040 for ; Sat, 27 Jun 2015 14:23:34 -0700 (PDT) Received: from [192.168.1.2] ([77.182.50.16]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0MddXQ-1ZRiLE0Zqu-00PLhp; Sat, 27 Jun 2015 23:23:28 +0200 Message-ID: <558F143E.60300@users.sourceforge.net> Date: Sat, 27 Jun 2015 23:23:10 +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 , Hai Li , dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/msm/dsi: One function call less in dsi_init() after error detection 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> <558F12BA.60709@users.sourceforge.net> In-Reply-To: <558F12BA.60709@users.sourceforge.net> X-Provags-ID: V03:K0:M9tTkRn/Q8vd8k0klwSr4+/E8tZdTkpwfFmlNKnMMAepRd54T3l XlFog6dT7bVMeUezW3JiN6P7PR+EBi2lnCanqDL+NHFpMqleSm5hZ9S9w9yv7UcyT8FrVCQ 61ZtCuRItv3UCYpbDm8e9KBupLKsQFHtcNp+cDY1uxpVzfNDBGLtvWK8QcrYRRKHY6TDvj5 SlRslaCK1BfDKOSStPKtw== X-UI-Out-Filterresults: notjunk:1; V01:K0:bvuZrQeko0s=:nNmE2lJH6nE8Gfdnu0ITAH G0/vx/uehl/qo0wXS5cqC/lfoJnX80JiZH9x4PhnDc79ih5yqM1kwwT7S6/vIrGmgLamX3Llz AvOd4kHmL2YZATYucwbj8dqrpGjD2qVSBNNPbLHh1sQko6nwckeQX7klt9VX7P6aY0udHYEC4 LwjwysLx1wBNqc0GvVQLpHna3hKz/UDh/oGn6cscF5WmSZdyvQO0v6MQL12W7U4z8zv/wDnMx FZFtioI7nC7YlJGOQObTl5AqG3tDWf4i09hEg6JuF9gaR7Z6xmwHs1QO4HHhFFmeqS3yC+jRE iIINMP2ZaMBLlwgh2k+6W8AW0Psqy918woSucSeCOtBKcI+errJP+syi2GN19aSPx9ygF+5Rm MWORGyueW+uvArHEIQoMDKIcdrtHvquM14bBnHsB3GmAG+xhIasikIajkChO5Di8JCQtuJ6Oc VZkMbJ12MMQdeeOcMgBfFDCyJR0O7hvT9QkJJ7O24BB5gnCGkOq+/RrwlKSgF2dRj0On1M2JZ 7lGFd6tkyAAgZT5OzmXEgs023hQF7epkqS+FQ0GqAk66DNtyrVurz9xnLBY9IsMh4fMEMwv5e rb0VNGL/x9F5Kp0Y58/3jaoRjuJqGIP0/ULAbwJ7wUJUzXvQ9wQT/Eo4dfXOrHMyz800KfEk2 HTXcrMXAqx7t9svR0Aqi9pL5C5EtF2arzS9sddQ740kAkaSKuIggHT/WK58lx350kaB0= X-Mailman-Approved-At: Sun, 28 Jun 2015 10:10:39 -0700 Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML 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.9 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: Sat, 27 Jun 2015 22:23:28 +0200 The dsi_destroy() function was called in two cases by the dsi_init() function during error handling even if the passed variable contained a null pointer. * This implementation detail could be improved by adjustments for jump targets according to the Linux coding style convention. * Drop an unnecessary initialisation for the variable "msm_dsi" then. Signed-off-by: Markus Elfring --- drivers/gpu/drm/msm/dsi/dsi.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index dc4f38f..971f000 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -74,19 +74,15 @@ static void dsi_destroy(struct msm_dsi *msm_dsi) static struct msm_dsi *dsi_init(struct platform_device *pdev) { - struct msm_dsi *msm_dsi = NULL; + struct msm_dsi *msm_dsi; int ret; - if (!pdev) { - ret = -ENXIO; - goto fail; - } + if (!pdev) + return -ENXIO; msm_dsi = devm_kzalloc(&pdev->dev, sizeof(*msm_dsi), GFP_KERNEL); - if (!msm_dsi) { - ret = -ENOMEM; - goto fail; - } + if (!msm_dsi) + return -ENOMEM; DBG("dsi probed=%p", msm_dsi); msm_dsi->pdev = pdev; @@ -95,21 +91,21 @@ static struct msm_dsi *dsi_init(struct platform_device *pdev) /* Init dsi host */ ret = msm_dsi_host_init(msm_dsi); if (ret) - goto fail; + goto destroy_dsi; /* GET dsi PHY */ ret = dsi_get_phy(msm_dsi); if (ret) - goto fail; + goto destroy_dsi; /* Register to dsi manager */ ret = msm_dsi_manager_register(msm_dsi); if (ret) - goto fail; + goto destroy_dsi; return msm_dsi; -fail: +destroy_dsi: dsi_destroy(msm_dsi); return ERR_PTR(ret); }