From d35d5fbb36e458c4383ebc98d3079e1c46c17b92 Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sat, 28 Jun 2014 23:55:44 +0100
Subject: [PATCH] staging: vt6656: remove vnt_add_basic_rate
The driver never sets basic rate any more so remove function.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/vt6656/card.c | 22 ----------------------
drivers/staging/vt6656/card.h | 1 -
drivers/staging/vt6656/main_usb.c | 7 ++-----
3 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 2ef45ca90fa9..82d6b640132c 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -470,28 +470,6 @@ void vnt_update_top_rates(struct vnt_private *priv)
priv->byTopCCKBasicRate = top_cck;
}
-/*
- * Description: Set NIC Tx Basic Rate
- *
- * Parameters:
- * In:
- * pDevice - The adapter to be set
- * wBasicRate - Basic Rate to be set
- * Out:
- * none
- *
- * Return Value: true if succeeded; false if failed.
- *
- */
-void vnt_add_basic_rate(struct vnt_private *priv, u16 rate_idx)
-{
-
- priv->wBasicRate |= (1 << rate_idx);
-
- /*Determines the highest basic rate.*/
- vnt_update_top_rates(priv);
-}
-
int vnt_ofdm_min_rate(struct vnt_private *priv)
{
int ii;
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 8c6f67d5a967..5b7cc5a908f6 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -49,7 +49,6 @@ void vnt_set_channel(struct vnt_private *, u32);
void vnt_set_rspinf(struct vnt_private *, u8);
void vnt_update_ifs(struct vnt_private *);
void vnt_update_top_rates(struct vnt_private *);
-void vnt_add_basic_rate(struct vnt_private *, u16);
int vnt_ofdm_min_rate(struct vnt_private *);
void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64);
bool vnt_get_current_tsf(struct vnt_private *, u64 *);
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index a1d0c983ccd0..d8164ecc0134 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -432,13 +432,10 @@ static int device_init_registers(struct vnt_private *pDevice)
* set BB and packet type at the same time
* set Short Slot Time, xIFS, and RSPINF
*/
- if (pDevice->byBBType == BB_TYPE_11A) {
- vnt_add_basic_rate(pDevice, RATE_6M);
+ if (pDevice->byBBType == BB_TYPE_11A)
pDevice->bShortSlotTime = true;
- } else {
- vnt_add_basic_rate(pDevice, RATE_1M);
+ else
pDevice->bShortSlotTime = false;
- }
BBvSetShortSlotTime(pDevice);
vnt_set_bss_mode(pDevice);
--
GitLab