From patchwork Sat Jan 2 14:45:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 7940741 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@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 A6F6BBEEE5 for ; Sat, 2 Jan 2016 14:45:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD25B203B7 for ; Sat, 2 Jan 2016 14:45:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEBD2203A5 for ; Sat, 2 Jan 2016 14:45:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751949AbcABOpY (ORCPT ); Sat, 2 Jan 2016 09:45:24 -0500 Received: from mout.web.de ([212.227.15.4]:51106 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751635AbcABOpW (ORCPT ); Sat, 2 Jan 2016 09:45:22 -0500 Received: from [192.168.1.2] ([77.181.40.156]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MHGJ1-1aRjUE2YRn-00E4hk; Sat, 02 Jan 2016 15:45:17 +0100 Subject: [PATCH 3/3] rsi: Replace variable initialisations by assignments in rsi_send_data_pkt() To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Kalle Valo References: <566ABCD9.1060404@users.sourceforge.net> <5687E169.4070704@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5687E27C.8000909@users.sourceforge.net> Date: Sat, 2 Jan 2016 15:45:16 +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: <5687E169.4070704@users.sourceforge.net> X-Provags-ID: V03:K0:8Au1cOkfp1205uAab1MdYc5LLrWdhg/9qULaWuq82iGzs5GM4OS rDl4yVJ7pva2EDmkoSy4abnK2fCS6AesqAgZq6fawM64nej7VucrRjuUt1MM0N3plfltwVt GZA9yjxDUmZpknu8GzkeyzXBa9Mt9TgAheyf6YTkfE2WMUiq1FpW+38HgdOTh4msP2zie3V qKwGYL0dHFdY06q6krSqg== X-UI-Out-Filterresults: notjunk:1; V01:K0:q4rtqdDcGbA=:T0XqaxB953ccQLcqhiT/N7 BVsOtqmZhk1/smMe5/dIzUPK9G65nZ2HTyqQZGFWtVvl/JkVPc9lOzvBIf3T2yC4oED/v5YvC DvYWNiEl+jNOtailM8s5If/aTir6w+RzP13FKNea1v62STFY7Aa7+ZVWW3kjmX7WaAxCvsMZ8 RzbR01AoEqXgVr0NoGNCVoPDSKQO2oHrMwribjJ5+wDgc/hl1F8O/WLIVJYR9U1MvVaPDlTWZ 9IjEtufS7C17QTQlGE7+ieHDxV0A+yZfJ5qwyb+iQ+Jeydk4MXllQut6NsMmxRQ+CCfRZ64Rx +eAJnh/Ll4KW5zYV5LQi5u3DhnIl7mdpgoroid5zrgRKgAcXzQBtG/8TVGd5nJJfiM1/YAn78 68MC2B8dyVlca38C3lvuPBx5ISogHKXCz5mmTCd19lZzcB00R6hC2Z2xktktRR2DnC/e1sGM2 fNW6RAGWh5h8IYQeCDHc/q7Aw8kmanZbhLloiQvVfwzvtDKs+FqMkZjMAIwaTtYG2qgmHjNcJ ypFVNBfGFB4FOLGT200yUUhdAGvfyBvNwKNFE9flossyYFLMPI077nAoQlyO2fUWzK/svqAeu qGo7rBWOLu9+MtPCnR0HpRDcvRiFZ4fEKMMkGRwA4kL0A4DMaBUFEN46mL+BYpCUyVAVZ5fst UKQNxYhJO7r4jBuYSUwVLj83MDsGCtDYTEFh0i4sU8OZBqZFKwXXYfrsQsvoMkZBsW41IjFCc HHvEYmJbIcrwvfuRHn34Af2bGCVP9YVrpZ8L+oYK/j27fqyK6+YDeDjZ6uhxvTg4sFZUbjqf3 JoSS8Xd Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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, 2 Jan 2016 15:25:34 +0100 Replace explicit initialisation for two local variables at the beginning by assignments. Signed-off-by: Markus Elfring --- drivers/net/wireless/rsi/rsi_91x_pkt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_pkt.c b/drivers/net/wireless/rsi/rsi_91x_pkt.c index ec65e1c..fe36e7d 100644 --- a/drivers/net/wireless/rsi/rsi_91x_pkt.c +++ b/drivers/net/wireless/rsi/rsi_91x_pkt.c @@ -26,12 +26,12 @@ */ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) { - struct rsi_hw *adapter = common->priv; + struct rsi_hw *adapter; struct ieee80211_hdr *tmp_hdr; struct ieee80211_tx_info *info; struct skb_info *tx_params; struct ieee80211_bss_conf *bss; - int status = -EINVAL; + int status; u8 ieee80211_size = MIN_802_11_HDR_LEN; u8 extnd_size; __le16 *frame_desc; @@ -41,8 +41,10 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) bss = &info->control.vif->bss_conf; tx_params = (struct skb_info *)info->driver_data; - if (!bss->assoc) + if (!bss->assoc) { + status = -EINVAL; goto err; + } tmp_hdr = (struct ieee80211_hdr *)&skb->data[0]; seq_num = (le16_to_cpu(tmp_hdr->seq_ctrl) >> 4); @@ -97,7 +99,7 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb) frame_desc[7] = cpu_to_le16(((tx_params->tid & 0xf) << 4) | (skb->priority & 0xf) | (tx_params->sta_id << 8)); - + adapter = common->priv; status = adapter->host_intf_write_pkt(common->priv, skb->data, skb->len);