staging: vt6656: antenna modes remove unused variables

dwTxAntennaSel is always the same as dwRxAntennaSel

byAntennaCount is never used.

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

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 7c8110586da2e3d13b936de82b5ac85a6a4fff7b..ecf8da02cd942e304bc7e77ee71990753d45f92e 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -319,8 +319,6 @@ struct vnt_private {
        /* Antenna Diversity */
        int bTxRxAntInv;
        u32 dwRxAntennaSel;
-       u32 dwTxAntennaSel;
-       u8 byAntennaCount;
        u8 byRxAntennaMode;
        u8 byTxAntennaMode;
        u8 byRadioCtl;

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index c0951bf33e4dc2c3c1a3d31257c843debd2e9b4c..4ca6639fb2abc755a9bf227b283345f49b0ade07 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -249,9 +249,7 @@ static int device_init_registers(struct vnt_private *priv)
                antenna = (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN);
 
        if (antenna == (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN)) {
-               priv->byAntennaCount = 2;
                priv->byTxAntennaMode = ANT_B;
-               priv->dwTxAntennaSel = 1;
                priv->dwRxAntennaSel = 1;
 
                if (priv->bTxRxAntInv == true)
@@ -259,8 +257,6 @@ static int device_init_registers(struct vnt_private *priv)
                else
                        priv->byRxAntennaMode = ANT_B;
        } else  {
-               priv->byAntennaCount = 1;
-               priv->dwTxAntennaSel = 0;
                priv->dwRxAntennaSel = 0;
 
                if (antenna & EEP_ANTENNA_AUX) {