staging: rtl8712: Simplify expressions with boolean logic

Simplify some expressions by using boolean operations.

Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
Link: https://lore.kernel.org/r/20200705143552.9368-3-mukadr@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 1f5ba9cbe951c8cbf9f66c7b5729aded39848875..d3fc6fa9a71507713a6ea27a487501e211d9cd9a 100644 (file)
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -99,12 +99,12 @@ static void fill_fwpriv(struct _adapter *adapter, struct fw_priv *fwpriv)
        default:
                fwpriv->rf_config = RTL8712_RFC_1T2R;
        }
-       fwpriv->mp_mode = (regpriv->mp_mode == 1) ? 1 : 0;
+       fwpriv->mp_mode = (regpriv->mp_mode == 1);
        /* 0:off 1:on 2:auto */
        fwpriv->vcs_type = regpriv->vrtl_carrier_sense;
        fwpriv->vcs_mode = regpriv->vcs_type; /* 1:RTS/CTS 2:CTS to self */
        /* default enable turbo_mode */
-       fwpriv->turbo_mode = ((regpriv->wifi_test == 1) ? 0 : 1);
+       fwpriv->turbo_mode = (regpriv->wifi_test != 1);
        fwpriv->low_power_mode = regpriv->low_power;
 }
 

diff --git a/drivers/staging/rtl8712/osdep_intf.h b/drivers/staging/rtl8712/osdep_intf.h
index 2cc25db1a91de84fce37991b199fade3a0612c23..9e75116c987ec32a518a8ece1829457180aee6a0 100644 (file)
--- a/drivers/staging/rtl8712/osdep_intf.h
+++ b/drivers/staging/rtl8712/osdep_intf.h
@@ -17,7 +17,7 @@
 #include "osdep_service.h"
 #include "drv_types.h"
 
-#define RND4(x)        (((x >> 2) + (((x & 3) == 0) ?  0 : 1)) << 2)
+#define RND4(x)        (((x >> 2) + ((x & 3) != 0)) << 2)
 
 struct intf_priv {
        u8 *intf_dev;

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index c513cda2a49e6421712007f936dbf586c1197f82..d83f421acfc1ea0409cbbaf02ebd5ba462494c41 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -143,9 +143,8 @@ static void update_recvframe_attrib_from_recvstat(struct rx_pkt_attrib *pattrib,
        /*TODO:
         * Offset 0
         */
-       pattrib->bdecrypted = ((le32_to_cpu(prxstat->rxdw0) & BIT(27)) >> 27)
-                                ? 0 : 1;
-       pattrib->crc_err = (le32_to_cpu(prxstat->rxdw0) & BIT(14)) >> 14;
+       pattrib->bdecrypted = (le32_to_cpu(prxstat->rxdw0) & BIT(27)) == 0;
+       pattrib->crc_err = (le32_to_cpu(prxstat->rxdw0) & BIT(14)) != 0;
        /*Offset 4*/
        /*Offset 8*/
        /*Offset 12*/