From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932732AbbERVWU (ORCPT ); Mon, 18 May 2015 17:22:20 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:34725 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932529AbbERVWN (ORCPT ); Mon, 18 May 2015 17:22:13 -0400 From: Pedro Marzo Perez To: gregkh@linuxfoundation.org, navyasri.tech@gmail.com, dilekuzulmez@gmail.com, joe@perches.com, haticeerturk27@gmail.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3 v3] Staging: rtl8192u: Simplify error check code at prism2_wep_init Date: Tue, 19 May 2015 01:32:22 +0200 Message-Id: <1431991944-16924-2-git-send-email-marzo.pedro@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431991944-16924-1-git-send-email-marzo.pedro@gmail.com> References: <1431991944-16924-1-git-send-email-marzo.pedro@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Merge two pr_debug lines with literal strings splitted across several lines into one single line, simplifying prism2_wep_init error check code. Signed-off-by: Pedro Marzo Perez --- .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c index 0a17f84..388ed3c 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c @@ -9,6 +9,8 @@ * more details. */ +#define pr_fmt(fmt) "ieee80211_crypt_wep: " fmt + #include #include #include @@ -43,20 +45,16 @@ static void *prism2_wep_init(int keyidx) priv = kzalloc(sizeof(*priv), GFP_ATOMIC); if (priv == NULL) - goto fail; + return NULL; priv->key_idx = keyidx; priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->tx_tfm)) { - pr_debug("ieee80211_crypt_wep: could not allocate " - "crypto API arc4\n"); priv->tx_tfm = NULL; goto fail; } priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->rx_tfm)) { - pr_debug("ieee80211_crypt_wep: could not allocate " - "crypto API arc4\n"); priv->rx_tfm = NULL; goto fail; } @@ -67,14 +65,12 @@ static void *prism2_wep_init(int keyidx) return priv; fail: - if (priv) { - if (priv->tx_tfm) - crypto_free_blkcipher(priv->tx_tfm); - if (priv->rx_tfm) - crypto_free_blkcipher(priv->rx_tfm); - kfree(priv); - } - + pr_debug("could not allocate crypto API arc4\n"); + if (priv->tx_tfm) + crypto_free_blkcipher(priv->tx_tfm); + if (priv->rx_tfm) + crypto_free_blkcipher(priv->rx_tfm); + kfree(priv); return NULL; } -- 1.9.1