From: Bing Zhao <bzhao@marvell.com>
To: <linux-wireless@vger.kernel.org>
Cc: "John W. Linville" <linville@tuxdriver.com>,
Daniel Drake <dsd@laptop.org>, Paul Fox <pgf@laptop.org>,
Tim Shepard <shep@laptop.org>, Jason Abele <jabele@chromium.org>,
John Rhodes <jrhodes@marvell.com>,
Amitkumar Karwar <akarwar@marvell.com>,
Avinash Patil <patila@marvell.com>,
Yogesh Ashok Powar <yogeshp@marvell.com>,
Nishant Sarmukadam <nishants@marvell.com>,
Frank Huang <frankh@marvell.com>, Bing Zhao <bzhao@marvell.com>
Subject: [PATCH 12/17] mwifiex: code rearrangement in mwifiex_get_rd_port()
Date: Mon, 13 May 2013 18:14:56 -0700 [thread overview]
Message-ID: <1368494101-23651-13-git-send-email-bzhao@marvell.com> (raw)
In-Reply-To: <1368494101-23651-1-git-send-email-bzhao@marvell.com>
From: Amitkumar Karwar <akarwar@marvell.com>
Get rid of 'if else' usage by returning in 'if' block.
This improves readability by removing indentations.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
---
drivers/net/wireless/mwifiex/sdio.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index e4357a6..a18a5b4 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -512,22 +512,23 @@ static int mwifiex_get_rd_port(struct mwifiex_adapter *adapter, u8 *port)
*port = CTRL_PORT;
dev_dbg(adapter->dev, "data: port=%d mp_rd_bitmap=0x%08x\n",
*port, card->mp_rd_bitmap);
- } else {
- if (card->mp_rd_bitmap & (1 << card->curr_rd_port)) {
- card->mp_rd_bitmap &= (u32)
- (~(1 << card->curr_rd_port));
- *port = card->curr_rd_port;
+ return 0;
+ }
- if (++card->curr_rd_port == card->max_ports)
- card->curr_rd_port = reg->start_rd_port;
- } else {
- return -1;
- }
+ if (!(card->mp_rd_bitmap & (1 << card->curr_rd_port)))
+ return -1;
+
+ /* We are now handling the SDIO data ports */
+ card->mp_rd_bitmap &= (u32)(~(1 << card->curr_rd_port));
+ *port = card->curr_rd_port;
+
+ if (++card->curr_rd_port == card->max_ports)
+ card->curr_rd_port = reg->start_rd_port;
+
+ dev_dbg(adapter->dev,
+ "data: port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n",
+ *port, rd_bitmap, card->mp_rd_bitmap);
- dev_dbg(adapter->dev,
- "data: port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n",
- *port, rd_bitmap, card->mp_rd_bitmap);
- }
return 0;
}
--
1.8.2.3
next prev parent reply other threads:[~2013-05-14 1:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-14 1:14 [PATCH 00/17] mwifiex updates for 3.11 Bing Zhao
2013-05-14 1:14 ` [PATCH 01/17] mwifiex: rename mwifiex_free_adapter() routine in init.c Bing Zhao
2013-05-14 1:14 ` [PATCH 02/17] mwifiex: scan delay timer cleanup in unload path Bing Zhao
2013-05-14 1:14 ` [PATCH 03/17] mwifiex: remove global user_scan_cfg variable Bing Zhao
2013-05-14 1:14 ` [PATCH 04/17] mwifiex: abort remaining scan commands when association started Bing Zhao
2013-05-14 1:14 ` [PATCH 05/17] mwifiex: avoid deleting all stations during mwifiex_del_sta_entry() Bing Zhao
2013-05-14 1:14 ` [PATCH 06/17] mwifiex: add del_station handler Bing Zhao
2013-05-14 1:14 ` [PATCH 07/17] mwifiex: replace spin_lock_irqsave with spin_lock and fix warn_on Bing Zhao
2013-05-14 1:14 ` [PATCH 08/17] mwifiex: add calibration data download feature Bing Zhao
2013-05-14 1:14 ` [PATCH 09/17] mwifiex: use u32 variables for SDIO read/write port bitmap Bing Zhao
2013-05-14 1:14 ` [PATCH 10/17] mwifiex: store SDIO chip specific information in separate structure Bing Zhao
2013-05-14 1:14 ` [PATCH 11/17] mwifiex: replace unnecessary u32 variables with u8 in sdio.c Bing Zhao
2013-05-14 1:14 ` Bing Zhao [this message]
2013-05-14 1:14 ` [PATCH 13/17] mwifiex: do port calculations separately Bing Zhao
2013-05-14 1:14 ` [PATCH 14/17] mwifiex: define a macro for MPA base address Bing Zhao
2013-05-14 1:14 ` [PATCH 15/17] mwifiex: remove unnecessary macros in sdio.h Bing Zhao
2013-05-14 1:15 ` [PATCH 16/17] mwifiex: code rearrangement in multiport aggregation path Bing Zhao
2013-05-14 1:15 ` [PATCH 17/17] mwifiex: add support for Marvell SD8897 chipset Bing Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368494101-23651-13-git-send-email-bzhao@marvell.com \
--to=bzhao@marvell.com \
--cc=akarwar@marvell.com \
--cc=dsd@laptop.org \
--cc=frankh@marvell.com \
--cc=jabele@chromium.org \
--cc=jrhodes@marvell.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=nishants@marvell.com \
--cc=patila@marvell.com \
--cc=pgf@laptop.org \
--cc=shep@laptop.org \
--cc=yogeshp@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox