Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Felix Schlepper <f3sch.git@outlook.com>
To:     gregkh@linuxfoundation.org
Cc:     linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v3 3/3] Staging: rtl8192e: Cleaning up error handling
Date:   Wed, 22 Jun 2022 17:12:46 +0200
Message-ID: <AM9P190MB1299C167B21A1FAA157AF1C7A5B29@AM9P190MB1299.EURP190.PROD.OUTLOOK.COM>
In-Reply-To: <cover.1655909205.git.f3sch.git@outlook.com>
References: <cover.1655909205.git.f3sch.git@outlook.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 651dfbb6-830b-4262-4528-08da5461ad5a
X-MS-TrafficTypeDiagnostic: AM9P190MB1041:EE_
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: SWE2di/wUSDifWptz1wfPb158TRf6S8gH/OSolLgPdUhJe3g8sSz9O+oTwmLKDVb6xVzEk2z5dF0LX/aFdthrhSH/qS9tPxWRovYcx2zzxImAFeIISe6Owx4YecwYs3XuL3kjQ6NjPpTm64aV7QOgHG6xVG6RON54GBw6ECqIFcZOXQjheyfBfML2a7i8vDxBa+6R9nvH5FziMXqoRGB3AfKKIdSx5iHoz/iMOcFHAYs45kn93hAHfHMoauoN8BiwlJiekhhEX8rzc+NpxiaZpE7jV87pe+Xm0Mlh7sJUbr+8Un0neRNKRV68Ie0Lj3RgDYANpB8MP0XgiXgBumdAi/REi8apzNXZMby4il1ZO5U7yzJK18yrFRwUFow5rDZfF58J9+/WOaXmKDLE3+eM8LCh7le86eMBBWXC5WeWEcSMzAhIWngeey2XIK6UeG6GJBanpFKzNs3Alc4ZcoOd/EP6Zu6bUcZrvjMPu8TsC0UxaXfyp46NQ00Fo+bS7PZvaEsYz0oFovkVHHEhCb+NynZv+tjydee1GVqgvn3VdiGjyRPfDJxMmRsMiAK3PkLyhxuyxQ3TmIglXpVQBH0vAN90PuQbpN6MtRklKjCjvF5dsWTi+wMWSJjau5aikQICiVngJCZLUBgcvVtZBH3GA==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nVw6A/GudvU0uElzrV73ZQ7qWhlBVwxKll8olNyG5aNBxr9qDok2bqJIXLtO?=
 =?us-ascii?Q?1hAsj461Sj+RuD+iqkhTYMfu4Jp/RbJd/+DESrrVIrMB62tCh0qqoBHAvM9D?=
 =?us-ascii?Q?xQ3F56tRJnVAbhRej59WF1KD6aofJDJds17VS5UotuS6vIzumB1V6Mgookxh?=
 =?us-ascii?Q?mr+TZflBhvirbA5aIKyw9GOPwqWAU05MwBIDCsn75QO+PuyLopNqjb5yWqmz?=
 =?us-ascii?Q?QwzQ2AKtkYvBd0NYvYOJsDsFdd3p9MiF/b3OtW9p0mDpQd0xm6xmxtPJRCuU?=
 =?us-ascii?Q?b4eCMRfUKeoNyO8sUph60JDB+zIS+zBiN/zJr25az/y8itbZv5czaZ/Zzt5/?=
 =?us-ascii?Q?OZsQZMoUbpE/YlFsFPX27eoBzcsToikmer/skGVtBf9cI1rSdQuLXdCL4+04?=
 =?us-ascii?Q?Kxx1sMMC7wmeE0ZHXXZDtGttwHryEKjb3Hic/bF4WuDyqz3znhEfAoSUL0uw?=
 =?us-ascii?Q?wLnGxSM3Ao1Sab+88TJevEDAJmFvlQttGxww7ZduCdGJr1Oa33rhv9At7pET?=
 =?us-ascii?Q?r0yNTb3s9sidbWoebO35dCjE0QadzWlT6l9MrSiIsWx5+W3gmrtgTtsls98t?=
 =?us-ascii?Q?lxjMZ5AY7nwxBkWhnvG44gxHLMqgf/9fbWgZ5DklUuXzAzxtJSQarZ8GpQz6?=
 =?us-ascii?Q?Z2i+Ygkru6rafvLniptS+QQKFDPTt4Yw0LKRkhym3SPi2A7zgh23mgGQtvjW?=
 =?us-ascii?Q?70OIhmCSuqixqilQoyYqXiyU3XPWsA31y9EVYheqLpNOBabPnxm68tYzw+Lt?=
 =?us-ascii?Q?Ta/XS7K1tWHHoBMPZb56UTVDPPcLNQfdUpCg7gQZxjmzxz7uez7wD5WWR4bG?=
 =?us-ascii?Q?n3cXtNWbG5vLAL+2i1KqHB2KKs9Ido3pFrNfwj4fOuk5GRdc2ws8XKkziasK?=
 =?us-ascii?Q?nc8ciUAgxXQ++HjdO6dFMgWXVBqUVqR4BWkQAP0RVcWtdcBVqjEPtbkxmpiB?=
 =?us-ascii?Q?sqQfH5Hr77EK4xggBHGFgvqecPr8152yabQdIkLxePLIXpLhUz54UgRslKP7?=
 =?us-ascii?Q?SNeP9ODOR82oVI0PKGqhoMRnA6dgqqt6iXvVdSQwAMYwP136Q0U5DCY65FJz?=
 =?us-ascii?Q?1K8HmAJXDmxuvviF0JO4drrm4ZFR6V4nTim5noIg0v/HbFiU7farBVZn7HV+?=
 =?us-ascii?Q?EI/f8OQww1kipApabPq8I52OnddqAycQB4woq65QBfBkpEl6z5B3jmjVnRu6?=
 =?us-ascii?Q?+19/lKUZiEoE5HMnMSVXF3QpkuZe0oYZ4c5WQ2Nmj28NepA5Y2/mkhNOlA/G?=
 =?us-ascii?Q?jwoQn7aPT6/1t2Izh/lfDyTHO5VRYY5Wo2B3b1hbMGvDll/ayFnoC1ZfQxCK?=
 =?us-ascii?Q?weO2BQbJZ4MRcVsSBH8U1e3VbgF6ZounRLJW3Yk+5VCLYCRpjeZXD9mAztAH?=
 =?us-ascii?Q?qc31FHPwb0Y5atCiHdq58wpGaxZNUPQpHFA/hY1S1sCBny+jd6MKa+Oi3VBp?=
 =?us-ascii?Q?3GPoBF5tGwo=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 651dfbb6-830b-4262-4528-08da5461ad5a
X-MS-Exchange-CrossTenant-AuthSource: AM9P190MB1299.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2022 15:12:52.4374
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P190MB1041
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,
        RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This error handling is more readable and reduces code size.

Signed-off-by: Felix Schlepper <f3sch.git@outlook.com>
---
 drivers/staging/rtl8192e/rtllib_tx.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 1307cf55741a..b246f5e0cad7 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -214,19 +214,18 @@ static struct rtllib_txb *rtllib_alloc_txb(int nr_frags, int txb_size,
 
 	for (i = 0; i < nr_frags; i++) {
 		txb->fragments[i] = dev_alloc_skb(txb_size);
-		if (unlikely(!txb->fragments[i])) {
-			i--;
-			break;
-		}
+		if (unlikely(!txb->fragments[i]))
+			goto err_free;
 		memset(txb->fragments[i]->cb, 0, sizeof(txb->fragments[i]->cb));
 	}
-	if (unlikely(i != nr_frags)) {
-		while (i >= 0)
-			dev_kfree_skb_any(txb->fragments[i--]);
-		kfree(txb);
-		return NULL;
-	}
+
 	return txb;
+
+err_free:
+	while (--i >= 0)
+		dev_kfree_skb_any(txb->fragments[i]);
+
+	return NULL;
 }
 
 static int rtllib_classify(struct sk_buff *skb, u8 bIsAmsdu)
-- 
2.36.1