From patchwork Mon Sep 12 09:38:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prameela Rani Garnepudi X-Patchwork-Id: 9326037 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 31B5360231 for ; Mon, 12 Sep 2016 09:43:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 234A828CAE for ; Mon, 12 Sep 2016 09:43:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17EDE28CB0; Mon, 12 Sep 2016 09:43:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0130728CAF for ; Mon, 12 Sep 2016 09:43:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757484AbcILJnb (ORCPT ); Mon, 12 Sep 2016 05:43:31 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:33409 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757479AbcILJna (ORCPT ); Mon, 12 Sep 2016 05:43:30 -0400 Received: by mail-pa0-f67.google.com with SMTP id h5so7563010pao.0 for ; Mon, 12 Sep 2016 02:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=KYsOJOH2hYKzTAwfekjvbyEBtIwWgZEQB/LdRlmFV+c=; b=zCSxakdRBFzwvD5yZtui9kjI5OsS3sE2Rgbdhnlv5MiqwSuTUd+41qOO1jTFUWvCHs ye7TV8mAsZxjAAOFhWqoK0WJGbhooxqr30UqHm3Eqw4jmT8XMlIJpBpkRav6eFFM4kxC Uu920y1Px2F+DMqc5tnqgAn1Sr3I7iAzuTFEmspRcCRqZpEmsRg/E6zZYyvK7prqwd7K 1khq4Rfgy9p426yVkdyJoBn0TLHxi4WxfOJAR7GY0cWFhaXV3poiZLPKUqtzDgR8VdsC 2ErOtkD2Sk28X3EiAmuTJWjEpwonhOFQZks3MOMcvrCgxhPknXEHOJGPMuR3CuC+loQ5 03TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=KYsOJOH2hYKzTAwfekjvbyEBtIwWgZEQB/LdRlmFV+c=; b=EhYnotdsGub00UTGQxDV0B+hn0VIACRZ36FS81+mTCrBzqq4Ycbg4JlrcETDIoZ4gl Nvm5IlUiaz9U0KU6OmOd5l0Mc/004aOdB76UG5AqwLaMEgldMCy7uSuq5JASZMWDQHPh V2necmxIy2aIolcv5jf3q5wDEkYuTgxGU4v36iNOG4WeJ//ECy2uT9cmWQJKtOSfBZok 2FNcVMtfEIp3Hmv7ds6F85Dbsu4g5yJ+0Eql2x2LgeytmmRm4pExtyvrcJFCZItZpgIS RJ5LKdDHgJ91OWY0RvPCYsIRpLGLQWJcfnpb1XBdnsyBiy1rfoulw7vSa7nHP+iCBo+F xl0A== X-Gm-Message-State: AE9vXwMTYcv4x+gP/gzTK2ZvlpcdVVVVn1cFzT5nxbM1Q/fp3oL6cHeymN/JjJM66wWzAg== X-Received: by 10.66.197.131 with SMTP id iu3mr31483969pac.97.1473673408822; Mon, 12 Sep 2016 02:43:28 -0700 (PDT) Received: from lapt225.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id 10sm21920168paq.20.2016.09.12.02.43.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 02:43:28 -0700 (PDT) From: Prameela Rani Garnepudi To: linux-wireless@vger.kernel.org, kvalo@codeaurora.org, johannes.berg@intel.com, hofrat@osadl.org Cc: prameela.j04cs@gmail.com, prameela.garnepudi@redpinesignals.com Subject: [PATCH 4/9] rsi: code clean up in file rsi_91x_main.c Date: Mon, 12 Sep 2016 15:08:19 +0530 Message-Id: X-Mailer: git-send-email 2.4.11 In-Reply-To: References: In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Prameela Rani Garnepudi --- drivers/net/wireless/rsi/rsi_91x_main.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_main.c b/drivers/net/wireless/rsi/rsi_91x_main.c index 8810862..f82e457 100644 --- a/drivers/net/wireless/rsi/rsi_91x_main.c +++ b/drivers/net/wireless/rsi/rsi_91x_main.c @@ -86,7 +86,7 @@ static struct sk_buff *rsi_prepare_skb(struct rsi_common *common, pkt_len -= extended_desc; skb = dev_alloc_skb(pkt_len + FRAME_DESC_SZ); - if (skb == NULL) + if (!skb) return NULL; payload_offset = (extended_desc + FRAME_DESC_SZ); @@ -111,11 +111,10 @@ static struct sk_buff *rsi_prepare_skb(struct rsi_common *common, int rsi_read_pkt(struct rsi_common *common, s32 rcv_pkt_len) { u8 *frame_desc = NULL, extended_desc = 0; - u32 index, length = 0, queueno = 0; + u32 index = 0, length = 0, queueno = 0; u16 actual_length = 0, offset; struct sk_buff *skb = NULL; - index = 0; do { frame_desc = &common->rx_data_pkt[index]; actual_length = *(u16 *)&frame_desc[0]; @@ -131,7 +130,7 @@ int rsi_read_pkt(struct rsi_common *common, s32 rcv_pkt_len) (frame_desc + offset), length, extended_desc); - if (skb == NULL) + if (!skb) goto fail; rsi_indicate_pkt_to_os(common, skb); @@ -198,15 +197,14 @@ struct rsi_hw *rsi_91x_init(void) return NULL; adapter->priv = kzalloc(sizeof(*common), GFP_KERNEL); - if (adapter->priv == NULL) { - rsi_dbg(ERR_ZONE, "%s: Failed in allocation of memory\n", + if (!adapter->priv) { + rsi_dbg(ERR_ZONE, "%s: Failed in allocation of common cb\n", __func__); kfree(adapter); return NULL; - } else { - common = adapter->priv; - common->priv = adapter; } + common = adapter->priv; + common->priv = adapter; for (ii = 0; ii < NUM_SOFT_QUEUES; ii++) skb_queue_head_init(&common->tx_queue[ii]);