From patchwork Sun Nov 15 18:54: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: 7619591 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8B4CBBF90C for ; Sun, 15 Nov 2015 18:54:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C29DE205B9 for ; Sun, 15 Nov 2015 18:54:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEF172053D for ; Sun, 15 Nov 2015 18:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752238AbbKOSyV (ORCPT ); Sun, 15 Nov 2015 13:54:21 -0500 Received: from mout.web.de ([212.227.15.3]:65082 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751629AbbKOSyU (ORCPT ); Sun, 15 Nov 2015 13:54:20 -0500 Received: from [192.168.1.3] ([77.182.168.43]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0Lxx4O-1aTk4u3lHo-015MKj; Sun, 15 Nov 2015 19:54:13 +0100 Subject: [PATCH 4/4] crypto-ixp4xx: Less function calls in init_ixp_crypto() after error detection To: "David S. Miller" , Herbert Xu , linux-crypto@vger.kernel.org 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> <5648D2C1.8050603@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5648D4D2.4080008@users.sourceforge.net> Date: Sun, 15 Nov 2015 19:54:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <5648D2C1.8050603@users.sourceforge.net> X-Provags-ID: V03:K0:3jUgxcw+fZhNv3BTMbgSzqQT0kds6nHNGI9pWTFGs1SrJU861AG hRoXWBeKheDjfYAE7Ha6OotaxLlzeRteYpwypt2rVMIfIEsJrVAF+OrYWnYdA90dl30rLBR 2sKeCihj+WqYUKdug4PNnX1RDB3cNa9Ccs3+qlAxEY7DHNlh7BRBe3Ko+NEBPfPt4e6flO0 /8nfQKY3TGBQrZ+nvJorg== X-UI-Out-Filterresults: notjunk:1; V01:K0:mIz5cG2efkw=:AXOCIeTpJiRctFcnHMPeHy xSVNtZARdSG6fQ82ZMXIRliGe8Z3/CemSroMfLeJudp3ahPqTgvVWUrYmGBLXrq3dVrruDIaU pb1w9QKC4nYJExfXw2cOw7TWBQoghlLbYhBO7ugbJdb4kZ1ul0XTq2aMYiMjOw0jOSQiEmcBh 5f1wYp6Nc5itPASQ9x2U3SGeCFr48U+s9E69RiMUEPbXroRszn8dBKalQdacrBl+5ZiKLFOG1 YxPYui4VpY7DuPg7+6jPhrgwvoM5k6FeKB1kZFThmi6rbwMzPHNf4B9wNzUvxT7mmN+FtglmF eABTJ65sTu3SkA1D3M10UNJd7l7GsXEvd/ABmJyh2yyfIpgY9SLyd6aCnpKSbeWUhT0Nf3UKU zG1kEqvWvqIxJ7gtA0oyWqLlH4GM9ouGMMxODZ9FIUU8OxE9c4AfmX3Nm1pcCKfmXwlbOHFkI CrsG6IJZEnD7PEKmKvAjNgFVKF7fvz6Cf1tAAjr5r26eSY2fycWBr4QJq7sdlXbLDMcEVelkZ NpsGjqTNTN0Z4B/aiIn9qEb3ukzUB7cGDXczoQqz2Mkdu8rqBOazT1Mb9LIuObDDiX7pfW7jN kRNL4okq67A9YnxNs2QVWqGQWSAsYaLwyuPzkcI59xkaXvh/bIyYzM1JnOSQwGLKiCUBoRKOZ 0Ac5+7+mDmYeaEPuvEp6gBhDXpqPgROgwbiKxX3EE08I9pssCVjEqo7A9ysuAtmBznHn+Mwzd tszR8eepJMKAn5C1Xdb7nG24B26vtXyFgBNVXGlFYHYffVRn743qtQPVA/9PO09CfOmY5bB5n Yzw9aK+ Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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, 15 Nov 2015 19:23:55 +0100 The dma_pool_destroy() function was called in up to two cases by the init_ixp_crypto() function during error handling even if a call of the dma_pool_create() function failed. This implementation detail could be improved by the adjustment of jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/crypto/ixp4xx_crypto.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c index 97da36a..a2c3155 100644 --- a/drivers/crypto/ixp4xx_crypto.c +++ b/drivers/crypto/ixp4xx_crypto.c @@ -483,23 +483,23 @@ static int init_ixp_crypto(struct device *dev) sizeof(struct buffer_desc), 32, 0); if (!buffer_pool) { ret = -ENOMEM; - goto err; + goto release_npe; } ctx_pool = dma_pool_create("context", dev, NPE_CTX_LEN, 16, 0); if (!ctx_pool) { ret = -ENOMEM; - goto err; + goto destroy_buffer_pool; } ret = qmgr_request_queue(SEND_QID, NPE_QLEN_TOTAL, 0, 0, "ixp_crypto:out", NULL); if (ret) - goto err; + goto destroy_ctx_pool; ret = qmgr_request_queue(RECV_QID, NPE_QLEN, 0, 0, "ixp_crypto:in", NULL); if (ret) { qmgr_release_queue(SEND_QID); - goto err; + goto destroy_ctx_pool; } qmgr_set_irq(RECV_QID, QUEUE_IRQ_SRC_NOT_EMPTY, irqhandler, NULL); tasklet_init(&crypto_done_tasklet, crypto_done_action, 0); @@ -511,8 +511,9 @@ npe_error: printk(KERN_ERR "%s not responding\n", npe_name(npe_c)); ret = -EIO; goto release_npe; -err: +destroy_ctx_pool: dma_pool_destroy(ctx_pool); +destroy_buffer_pool: dma_pool_destroy(buffer_pool); release_npe: npe_release(npe_c);