staging: vt6655: Rename byPreambleType field

Drop Hungarian notation prefix in `byPreambleType` member of
struct vnt_private. Change it to use snake case.

Fix issue detected by checkpatch.pl:
  CHECK: Avoid CamelCase: <byPreambleType>

Signed-off-by: Karolina Drobnik <karolinadrobnik@gmail.com>
Link: https://lore.kernel.org/r/20211018150317.9590-1-karolinadrobnik@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index 0bae35af6e0fe085a362d65ae62201b0f14df6e3..5efca92f1f18de34ba397726358cb85be8bb4177 100644 (file)
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1764,7 +1764,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
        u32 count = 0;
        u32 tmp;
        int ext_bit;
-       u8 preamble_type = priv->byPreambleType;
+       u8 preamble_type = priv->preamble_type;
 
        bit_count = frame_length * 8;
        ext_bit = false;

diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 92d6f82f939f3d6f3200d0064f7c05bb4593a5c1..4706bde1ec1d11137ce071c2a4c0a07fac6e3ee5 100644 (file)
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -203,7 +203,7 @@ struct vnt_private {
        unsigned char byMinChannel;
        unsigned char byMaxChannel;
 
-       unsigned char byPreambleType;
+       unsigned char preamble_type;
        unsigned char byShortPreamble;
 
        unsigned short wCurrentRate;

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 24f0e346da129e05384bf6862cae5206669ae86c..212d2a287b2c1a26257cf368d2f25332e9ef72b1 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -177,11 +177,11 @@ device_set_options(struct vnt_private *priv)
        priv->byPacketType = priv->byBBType;
        priv->byAutoFBCtrl = AUTO_FB_0;
        priv->bUpdateBBVGA = true;
-       priv->byPreambleType = 0;
+       priv->preamble_type = 0;
 
        pr_debug(" byShortRetryLimit= %d\n", (int)priv->byShortRetryLimit);
        pr_debug(" byLongRetryLimit= %d\n", (int)priv->byLongRetryLimit);
-       pr_debug(" byPreambleType= %d\n", (int)priv->byPreambleType);
+       pr_debug(" preamble_type= %d\n", (int)priv->preamble_type);
        pr_debug(" byShortPreamble= %d\n", (int)priv->byShortPreamble);
        pr_debug(" byBBType= %d\n", (int)priv->byBBType);
 }
@@ -1424,10 +1424,10 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                if (conf->use_short_preamble) {
                        MACvEnableBarkerPreambleMd(priv->port_offset);
-                       priv->byPreambleType = true;
+                       priv->preamble_type = true;
                } else {
                        MACvDisableBarkerPreambleMd(priv->port_offset);
-                       priv->byPreambleType = false;
+                       priv->preamble_type = false;
                }
        }
 

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index ff0b5391ea0b0314d1dee7feae3c5ada58591737..0de801b666da8ebdb8cb3d2bbb79e956833dffb4 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -142,7 +142,7 @@ s_uFillDataHead(
 
 static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
 {
-       return cpu_to_le16(wTimeStampOff[priv->byPreambleType % 2]
+       return cpu_to_le16(wTimeStampOff[priv->preamble_type % 2]
                                                        [rate % MAX_RATE]);
 }
 
@@ -163,7 +163,7 @@ s_uGetTxRsvTime(
 {
        unsigned int uDataTime, uAckTime;
 
-       uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wRate);
+       uDataTime = bb_get_frame_time(pDevice->preamble_type, byPktType, cbFrameLength, wRate);
 
        if (!bNeedAck)
                return uDataTime;
@@ -172,7 +172,7 @@ s_uGetTxRsvTime(
         * CCK mode  - 11b
         * OFDM mode - 11g 2.4G & 11a 5G
         */
-       uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14,
+       uAckTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
                                     byPktType == PK_TYPE_11B ?
                                     pDevice->byTopCCKBasicRate :
                                     pDevice->byTopOFDMBasicRate);
@@ -200,22 +200,22 @@ static __le16 get_rtscts_time(struct vnt_private *priv,
        unsigned int ack_time = 0;
        unsigned int data_time = 0;
 
-       data_time = bb_get_frame_time(priv->byPreambleType, pkt_type, frame_length, current_rate);
+       data_time = bb_get_frame_time(priv->preamble_type, pkt_type, frame_length, current_rate);
        if (rts_rsvtype == 0) { /* RTSTxRrvTime_bb */
-               rts_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 20, priv->byTopCCKBasicRate);
-               ack_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopCCKBasicRate);
+               rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20, priv->byTopCCKBasicRate);
+               ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopCCKBasicRate);
                cts_time = ack_time;
        } else if (rts_rsvtype == 1) { /* RTSTxRrvTime_ba, only in 2.4GHZ */
-               rts_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 20, priv->byTopCCKBasicRate);
-               cts_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopCCKBasicRate);
-               ack_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopOFDMBasicRate);
+               rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20, priv->byTopCCKBasicRate);
+               cts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopCCKBasicRate);
+               ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate);
        } else if (rts_rsvtype == 2) { /* RTSTxRrvTime_aa */
-               rts_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 20, priv->byTopOFDMBasicRate);
-               ack_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopOFDMBasicRate);
+               rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20, priv->byTopOFDMBasicRate);
+               ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate);
                cts_time = ack_time;
        } else if (rts_rsvtype == 3) { /* CTSTxRrvTime_ba, only in 2.4GHZ */
-               cts_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopCCKBasicRate);
-               ack_time = bb_get_frame_time(priv->byPreambleType, pkt_type, 14, priv->byTopOFDMBasicRate);
+               cts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopCCKBasicRate);
+               ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate);
                rrv_time = cts_time + ack_time + data_time + 2 * priv->uSIFS;
                return cpu_to_le16((u16)rrv_time);
        }
@@ -255,7 +255,7 @@ s_uGetDataDuration(
        switch (byDurType) {
        case DATADUR_B:    /* DATADUR_B */
                if (bNeedAck) {
-                       uAckTime = bb_get_frame_time(pDevice->byPreambleType,
+                       uAckTime = bb_get_frame_time(pDevice->preamble_type,
                                                     byPktType, 14,
                                                     pDevice->byTopCCKBasicRate);
                }
@@ -273,7 +273,7 @@ s_uGetDataDuration(
 
        case DATADUR_A:    /* DATADUR_A */
                if (bNeedAck) {
-                       uAckTime = bb_get_frame_time(pDevice->byPreambleType,
+                       uAckTime = bb_get_frame_time(pDevice->preamble_type,
                                                     byPktType, 14,
                                                     pDevice->byTopOFDMBasicRate);
                }
@@ -292,7 +292,7 @@ s_uGetDataDuration(
        case DATADUR_A_F0:    /* DATADUR_A_F0 */
        case DATADUR_A_F1:    /* DATADUR_A_F1 */
                if (bNeedAck) {
-                       uAckTime = bb_get_frame_time(pDevice->byPreambleType,
+                       uAckTime = bb_get_frame_time(pDevice->preamble_type,
                                                     byPktType, 14,
                                                     pDevice->byTopOFDMBasicRate);
                }
@@ -344,17 +344,17 @@ s_uGetRTSCTSDuration(
 
        switch (byDurType) {
        case RTSDUR_BB:    /* RTSDuration_bb */
-               uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
+               uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
                uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
                break;
 
        case RTSDUR_BA:    /* RTSDuration_ba */
-               uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
+               uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
                uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
                break;
 
        case RTSDUR_AA:    /* RTSDuration_aa */
-               uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
+               uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopOFDMBasicRate);
                uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
                break;
 
@@ -363,7 +363,7 @@ s_uGetRTSCTSDuration(
                break;
 
        case RTSDUR_BA_F0: /* RTSDuration_ba_f0 */
-               uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
+               uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
                if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
                        uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
                else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
@@ -372,7 +372,7 @@ s_uGetRTSCTSDuration(
                break;
 
        case RTSDUR_AA_F0: /* RTSDuration_aa_f0 */
-               uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
+               uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopOFDMBasicRate);
                if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
                        uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
                else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
@@ -381,7 +381,7 @@ s_uGetRTSCTSDuration(
                break;
 
        case RTSDUR_BA_F1: /* RTSDuration_ba_f1 */
-               uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
+               uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
                if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
                        uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
                else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
@@ -390,7 +390,7 @@ s_uGetRTSCTSDuration(
                break;
 
        case RTSDUR_AA_F1: /* RTSDuration_aa_f1 */
-               uCTSTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
+               uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopOFDMBasicRate);
                if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
                        uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
                else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
@@ -1289,9 +1289,9 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
                tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_LRETRY);
 
        if (tx_rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
-               priv->byPreambleType = PREAMBLE_SHORT;
+               priv->preamble_type = PREAMBLE_SHORT;
        else
-               priv->byPreambleType = PREAMBLE_LONG;
+               priv->preamble_type = PREAMBLE_LONG;
 
        if (tx_rate->flags & IEEE80211_TX_RC_USE_RTS_CTS)
                tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_RTS);