[PATCH v2 08/24] staging: ks7010: separate dissimilar checks

Tobin C. Harding me at tobin.cc
Wed Apr 5 00:42:11 UTC 2017


Function contains a list of four checks, for no apparent reason two of them
are OR'ed together. Having two OR'ed together and the other two not
implies some connection between the two that are combined. It is
easier to read this code if the four unrelated checks are done as
separate statements.

Move dissimilar expressions out of logical continuation and into
separate statement.

Signed-off-by: Tobin C. Harding <me at tobin.cc>
---
 drivers/staging/ks7010/ks7010_sdio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index 1db59c6..42e96e1 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -177,8 +177,10 @@ static void _ks_wlan_hw_power_save(struct ks_wlan_private *priv)
 	if (priv->reg.powermgt == POWMGT_ACTIVE_MODE)
 		return;
 
-	if (priv->reg.operation_mode != MODE_INFRASTRUCTURE ||
-	    (priv->connect_status & CONNECT_STATUS_MASK) != CONNECT_STATUS)
+	if (priv->reg.operation_mode != MODE_INFRASTRUCTURE)
+		return;
+
+	if ((priv->connect_status & CONNECT_STATUS_MASK) != CONNECT_STATUS)
 		return;
 
 	if (priv->dev_state != DEVICE_STATE_SLEEP)
-- 
2.7.4



More information about the devel mailing list