These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / vt6656 / card.c

diff --git a/kernel/drivers/staging/vt6656/card.c b/kernel/drivers/staging/vt6656/card.c
index 67ff13f..927243e 100644 (file)
--- a/kernel/drivers/staging/vt6656/card.c
+++ b/kernel/drivers/staging/vt6656/card.c
@@ -82,7 +82,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel)
                                        connection_channel, 0, 0, NULL);
 
        vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG, MAC_REG_CHANNEL,
-               (u8)(connection_channel|0x80));
+               (u8)(connection_channel | 0x80));
 }
 
 /*
@@ -285,7 +285,6 @@ void vnt_set_rspinf(struct vnt_private *priv, u8 bb_type)
        vnt_get_phy_field(priv, 14,
                vnt_get_cck_rate(priv, RATE_11M), PK_TYPE_11B, &phy[3]);
 
-
        /*RSPINF_a_6*/
        vnt_calculate_ofdm_rate(RATE_6M, bb_type, &tx_rate[0], &rsv_time[0]);
 
@@ -389,7 +388,7 @@ void vnt_update_ifs(struct vnt_private *priv)
                        }
                }
 
-               if (ofdm_rate == true)
+               if (ofdm_rate)
                        max_min = 4;
                else
                        max_min = 5;
@@ -473,7 +472,7 @@ int vnt_ofdm_min_rate(struct vnt_private *priv)
        int ii;
 
        for (ii = RATE_54M; ii >= RATE_6M; ii--) {
-               if ((priv->basic_rates) & ((u16)(1 << ii)))
+               if ((priv->basic_rates) & ((u16)BIT(ii)))
                        return true;
        }
 
@@ -508,7 +507,7 @@ u8 vnt_get_pkt_type(struct vnt_private *priv)
 u64 vnt_get_tsf_offset(u8 rx_rate, u64 tsf1, u64 tsf2)
 {
        u64 tsf_offset = 0;
-       u16 rx_bcn_offset = 0;
+       u16 rx_bcn_offset;
 
        rx_bcn_offset = cwRXBCNTSFOff[rx_rate % MAX_RATE];