staging: vt6656: BBuGetFrameTime remove uRateIdx

Remove uRateIdx and rename wRate tx_rate

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index dbe06f9ec4c8bee6605472bbcd6840a888545278..baa3858fee6694c111311d332ac14dbca3b4f42b 100644 (file)
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -657,27 +657,26 @@ s_vClearSQ3Value(PSDevice pDevice);
  *      byPreambleType  - Preamble Type
  *      byPktType        - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA
  *      cbFrameLength   - Baseband Type
- *      wRate           - Tx Rate
+ *     tx_rate         - Tx Rate
  *  Out:
  *
  * Return Value: FrameTime
  *
  */
-unsigned int BBuGetFrameTime(u8 byPreambleType,  u8 byPktType,
-       unsigned int cbFrameLength, u16 wRate)
+unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType,
+       unsigned int cbFrameLength, u16 tx_rate)
 {
        unsigned int uFrameTime;
        unsigned int uPreamble;
        unsigned int uTmp;
-       unsigned int uRateIdx = (unsigned int)wRate;
        unsigned int uRate = 0;
 
-       if (uRateIdx > RATE_54M)
+       if (tx_rate > RATE_54M)
                return 0;
 
-       uRate = (unsigned int)awcFrameTime[uRateIdx];
+       uRate = (unsigned int)awcFrameTime[tx_rate];
 
-       if (uRateIdx <= 3) {
+       if (tx_rate <= 3) {
                if (byPreambleType == 1)
                        uPreamble = 96;
                else

diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h
index 79faedf4a5e9fb12a49f91889fab1b5185052770..08c24a3b31891e77279cebc95d79d332ec07df8b 100644 (file)
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -88,13 +88,8 @@ struct vnt_phy_field {
        __le16 len;
 } __packed;
 
-unsigned int
-BBuGetFrameTime(
-     u8 byPreambleType,
-     u8 byFreqType,
-     unsigned int cbFrameLength,
-     u16 wRate
-    );
+unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType,
+       unsigned int cbFrameLength, u16 tx_rate);
 
 void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength,
        u16 wRate, u8 byPacketType, struct vnt_phy_field *);