From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888AbbFZIP4 (ORCPT ); Fri, 26 Jun 2015 04:15:56 -0400 Received: from mout.web.de ([212.227.17.12]:61695 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbbFZIPo (ORCPT ); Fri, 26 Jun 2015 04:15:44 -0400 Message-ID: <558D0A27.7010905@users.sourceforge.net> Date: Fri, 26 Jun 2015 10:15: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: linux-kernel@vger.kernel.org CC: kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] lib/mpi: Delete unnecessary checks before the function call "mpi_free_limb_space" 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> <5467BB2A.2030108@users.sourceforge.net> In-Reply-To: <5467BB2A.2030108@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:0mFGZsg1yMvgviv4Rl0PPhnChUsKMRLCCAackObZkOt8eBaaxc9 ofVL60VAfR/pLcvQQLRNCC8DQVUU6kg3hwuzBQ5F04z3deUsHSwiaTXPliMIjt8RI96ExCo echinxeMMU9/Yz7w/UKkDYweLaXqtMn0LZFzMLRmcYByDOx0sqm7P+kN7WQtFUPMJ84IoQd sf6x3ky6++a3y9oK3rUmQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:JgJ6/WfvDco=:MzyYdnrJ/cQR6/Q/rEBatY WQUdGJSATu6/yL2yW0MCygeOLyfBHQrDwh2O0mCkQcw0SOgL/qre9hOO7V0M2vct2KkBUXtoo KX7NSjXswykRt5y8PGM+3bkCuU/mEjP+B5lXXJWBd7XhvxVO7E9yjdg5/oWsd8r5peB3mIi5w w1a/gscU7aBGDkjhFEc0h3YNuVHxx2xb9FhYBt8Skr0OM+SdJCRC1txUedReYtyqNy9TiSNoL 7VkdK3vG7sngwjjOnc8Js1wVakDS0X0FSUh+mK0QfapxzoRL3KylNgTnL1bJaq3J1+VuxdcBE db+t4UUn9SsnIdRYyRHBs2TwiUiiQIfR1Z62P+q0pAg+4MyDO2f2GGZhly7AneHkVSt6eu/w2 q7YmtwuKDbZeduSbNpoEYNTK4gF29JVNYO5WoFe6ya8Ifv2DbVpvZiyyjVmFs0NZMdpS9+P4Y 7h0KfV1png4eZoUNRevGzcMZISfP+0ETN/K0oV68NgoRIxOFKAugEbxXHkUxKgmCxHdCpLSEZ k+APYKp+f3CgTIERuy6uIy7LhO7G2VPR63qRpFzyOjISBbdbf29rHLxJEXrhZSTm4D8cL97FM uwcf3k9Hasvbmlg+pfzmBgLV49hm5lIhirr5NdY5KkZDciBKjtew+db99QBJYuL2jbvTYfqrr cnjpnHyViHeAXe0w8Qmw4XlvTpwyxSR1dMKo7+SKgLjKRnEbt8/nAJWg07fp51tCM/Wk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 26 Jun 2015 10:11:19 +0200 The mpi_free_limb_space() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- lib/mpi/mpi-pow.c | 15 +++++---------- lib/mpi/mpih-mul.c | 21 +++++++-------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c index 5464c87..c28882f 100644 --- a/lib/mpi/mpi-pow.c +++ b/lib/mpi/mpi-pow.c @@ -308,16 +308,11 @@ leave: enomem: if (assign_rp) mpi_assign_limb_space(res, rp, size); - if (mp_marker) - mpi_free_limb_space(mp_marker); - if (bp_marker) - mpi_free_limb_space(bp_marker); - if (ep_marker) - mpi_free_limb_space(ep_marker); - if (xp_marker) - mpi_free_limb_space(xp_marker); - if (tspace) - mpi_free_limb_space(tspace); + mpi_free_limb_space(mp_marker); + mpi_free_limb_space(bp_marker); + mpi_free_limb_space(ep_marker); + mpi_free_limb_space(xp_marker); + mpi_free_limb_space(tspace); return rc; } EXPORT_SYMBOL_GPL(mpi_powm); diff --git a/lib/mpi/mpih-mul.c b/lib/mpi/mpih-mul.c index 7c84171..ff021cc 100644 --- a/lib/mpi/mpih-mul.c +++ b/lib/mpi/mpih-mul.c @@ -339,8 +339,7 @@ mpihelp_mul_karatsuba_case(mpi_ptr_t prodp, mpi_limb_t cy; if (!ctx->tspace || ctx->tspace_size < vsize) { - if (ctx->tspace) - mpi_free_limb_space(ctx->tspace); + mpi_free_limb_space(ctx->tspace); ctx->tspace = mpi_alloc_limb_space(2 * vsize); if (!ctx->tspace) return -ENOMEM; @@ -354,12 +353,10 @@ mpihelp_mul_karatsuba_case(mpi_ptr_t prodp, usize -= vsize; if (usize >= vsize) { if (!ctx->tp || ctx->tp_size < vsize) { - if (ctx->tp) - mpi_free_limb_space(ctx->tp); + mpi_free_limb_space(ctx->tp); ctx->tp = mpi_alloc_limb_space(2 * vsize); if (!ctx->tp) { - if (ctx->tspace) - mpi_free_limb_space(ctx->tspace); + mpi_free_limb_space(ctx->tspace); ctx->tspace = NULL; return -ENOMEM; } @@ -407,16 +404,12 @@ void mpihelp_release_karatsuba_ctx(struct karatsuba_ctx *ctx) { struct karatsuba_ctx *ctx2; - if (ctx->tp) - mpi_free_limb_space(ctx->tp); - if (ctx->tspace) - mpi_free_limb_space(ctx->tspace); + mpi_free_limb_space(ctx->tp); + mpi_free_limb_space(ctx->tspace); for (ctx = ctx->next; ctx; ctx = ctx2) { ctx2 = ctx->next; - if (ctx->tp) - mpi_free_limb_space(ctx->tp); - if (ctx->tspace) - mpi_free_limb_space(ctx->tspace); + mpi_free_limb_space(ctx->tp); + mpi_free_limb_space(ctx->tspace); kfree(ctx); } } -- 2.4.4