All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Tobin C. Harding" <me@tobin.cc>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: driverdev-devel@linuxdriverproject.org, Wolfram Sang <wsa@the-dreams.de>
Subject: [PATCH 4/5] staging: ks7010: remove switch statement
Date: Mon, 27 Feb 2017 14:14:47 +1100	[thread overview]
Message-ID: <1488165288-1629-5-git-send-email-me@tobin.cc> (raw)
In-Reply-To: <1488165288-1629-1-git-send-email-me@tobin.cc>

Switch statement uses one [trivial] case and a default case holding
bulk of code. We can swap the switch statement with an if/return
statement as replacement for the original switch. This can be done
without changing the program logic.

Remove switch statement. Use original switch parameter as conditional
and return if conditional evaluates to true. Reduce level of
indentation. Do not change the program logic.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
---
 drivers/staging/ks7010/ks7010_sdio.c | 89 +++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index 0e07b83..04130fb 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -183,63 +183,60 @@ static int _ks_wlan_hw_power_save(struct ks_wlan_private *priv)
 	if (priv->dev_state != DEVICE_STATE_SLEEP)
 		return 0;
 
-	switch (atomic_read(&priv->psstatus.status)) {
-	case PS_SNOOZE:	/* 4 */
-		break;
-	default:
-		DPRINTK(5, "\npsstatus.status=%d\npsstatus.confirm_wait=%d\npsstatus.snooze_guard=%d\ncnt_txqbody=%d\n",
-			atomic_read(&priv->psstatus.status),
-			atomic_read(&priv->psstatus.confirm_wait),
-			atomic_read(&priv->psstatus.snooze_guard),
-			cnt_txqbody(priv));
-
-		if (!atomic_read(&priv->psstatus.confirm_wait) &&
-		    !atomic_read(&priv->psstatus.snooze_guard) &&
-		    !cnt_txqbody(priv)) {
+	if (atomic_read(&priv->psstatus.status) == PS_SNOOZE)
+		return 0;
+
+	DPRINTK(5, "\npsstatus.status=%d\npsstatus.confirm_wait=%d\npsstatus.snooze_guard=%d\ncnt_txqbody=%d\n",
+		atomic_read(&priv->psstatus.status),
+		atomic_read(&priv->psstatus.confirm_wait),
+		atomic_read(&priv->psstatus.snooze_guard),
+		cnt_txqbody(priv));
+
+	if (!atomic_read(&priv->psstatus.confirm_wait) &&
+		!atomic_read(&priv->psstatus.snooze_guard) &&
+		!cnt_txqbody(priv)) {
+		retval =
+			ks7010_sdio_read(priv, INT_PENDING,
+					&rw_data,
+					sizeof(rw_data));
+		if (retval) {
+			DPRINTK(1,
+				" error : INT_PENDING=%02X\n",
+				rw_data);
+			queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,
+					&priv->ks_wlan_hw.rw_wq, 1);
+			return 0;
+		}
+		if (!rw_data) {
+			rw_data = GCR_B_DOZE;
 			retval =
-				ks7010_sdio_read(priv, INT_PENDING,
+				ks7010_sdio_write(priv,
+						GCR_B,
 						&rw_data,
 						sizeof(rw_data));
 			if (retval) {
 				DPRINTK(1,
-					" error : INT_PENDING=%02X\n",
+					" error : GCR_B=%02X\n",
 					rw_data);
-				queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,
-						&priv->ks_wlan_hw.rw_wq, 1);
-				break;
-			}
-			if (!rw_data) {
-				rw_data = GCR_B_DOZE;
-				retval =
-					ks7010_sdio_write(priv,
-							GCR_B,
-							&rw_data,
-							sizeof(rw_data));
-				if (retval) {
-					DPRINTK(1,
-						" error : GCR_B=%02X\n",
-						rw_data);
-					queue_delayed_work
-						(priv->ks_wlan_hw.ks7010sdio_wq,
-							&priv->ks_wlan_hw.rw_wq, 1);
-					break;
-				}
-				DPRINTK(4,
-					"PMG SET!! : GCR_B=%02X\n",
-					rw_data);
-				atomic_set(&priv->psstatus.status, PS_SNOOZE);
-				DPRINTK(3,
-					"psstatus.status=PS_SNOOZE\n");
-			} else {
-				queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,
+				queue_delayed_work
+					(priv->ks_wlan_hw.ks7010sdio_wq,
 						&priv->ks_wlan_hw.rw_wq, 1);
+				return 0;
 			}
+			DPRINTK(4,
+				"PMG SET!! : GCR_B=%02X\n",
+				rw_data);
+			atomic_set(&priv->psstatus.status, PS_SNOOZE);
+			DPRINTK(3,
+				"psstatus.status=PS_SNOOZE\n");
 		} else {
 			queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,
-					&priv->ks_wlan_hw.rw_wq,
-					0);
+					&priv->ks_wlan_hw.rw_wq, 1);
 		}
-		break;
+	} else {
+		queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,
+				&priv->ks_wlan_hw.rw_wq,
+				0);
 	}
 
 	return 0;
-- 
2.7.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

  parent reply	other threads:[~2017-02-27  3:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-27  3:14 [PATCH 0/5] staging: ks7010 refactor _ks_wlan_hw_power_save Tobin C. Harding
2017-02-27  3:14 ` [PATCH 1/5] staging: ks7010: invert conditional, reduce indent Tobin C. Harding
2017-02-27  3:14 ` [PATCH 2/5] staging: ks7010: fix checkpatch MULTILINE_DEREFERENCE Tobin C. Harding
2017-02-27  3:14 ` [PATCH 3/5] staging: ks7010: move logic operator to end of line Tobin C. Harding
2017-02-27  3:14 ` Tobin C. Harding [this message]
2017-02-27  3:14 ` [PATCH 5/5] staging: ks7010: refactor function call parameters Tobin C. Harding

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=1488165288-1629-5-git-send-email-me@tobin.cc \
    --to=me@tobin.cc \
    --cc=driverdev-devel@linuxdriverproject.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=wsa@the-dreams.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.