]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: ks7010: separate dissimilar checks
authorTobin C. Harding <me@tobin.cc>
Mon, 10 Apr 2017 03:15:45 +0000 (13:15 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Apr 2017 14:03:36 +0000 (16:03 +0200)
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@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ks7010/ks7010_sdio.c

index 1db59c6946bc9180085da7e5a549ba8dea0e06cc..42e96e113747fd11aabcfb73b2f9790388a27227 100644 (file)
@@ -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)