diff options
| author |   Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-19 12:30:16 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:11:58 -0700 |
| commit | 2044dbdb0b337ab7ddc36c45fc792b76913b57e8 (patch) | |
| tree | 35dc6941200060edb0da3ac16be24a9051e32b38 /drivers/staging/vt6656/main_usb.c | |
| parent | staging: vt6656: antenna modes remove unused variables (diff) | |
| download | linux-dev-2044dbdb0b337ab7ddc36c45fc792b76913b57e8.tar.xz linux-dev-2044dbdb0b337ab7ddc36c45fc792b76913b57e8.zip | |
staging: vt6656: struct vnt_private remove camel case antenna variables
Camel case changes
bTxRxAntInv -> tx_rx_ant_inv
dwRxAntennaSel -> rx_antenna_sel
byRxAntennaMode -> rx_antenna_mode
byTxAntennaMode -> tx_antenna_mode
byRadioCtl -> radio_ctl
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/main_usb.c')
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 4ca6639fb2ab..1137a190ec0e 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -239,9 +239,9 @@ static int device_init_registers(struct vnt_private *priv) antenna = priv->abyEEPROM[EEP_OFS_ANTENNA]; if (antenna & EEP_ANTINV) - priv->bTxRxAntInv = true; + priv->tx_rx_ant_inv = true; else - priv->bTxRxAntInv = false; + priv->tx_rx_ant_inv = false; antenna &= (EEP_ANTENNA_AUX | EEP_ANTENNA_MAIN); @@ -249,35 +249,35 @@ 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->byTxAntennaMode = ANT_B; - priv->dwRxAntennaSel = 1; + priv->tx_antenna_mode = ANT_B; + priv->rx_antenna_sel = 1; - if (priv->bTxRxAntInv == true) - priv->byRxAntennaMode = ANT_A; + if (priv->tx_rx_ant_inv == true) + priv->rx_antenna_mode = ANT_A; else - priv->byRxAntennaMode = ANT_B; + priv->rx_antenna_mode = ANT_B; } else { - priv->dwRxAntennaSel = 0; + priv->rx_antenna_sel = 0; if (antenna & EEP_ANTENNA_AUX) { - priv->byTxAntennaMode = ANT_A; + priv->tx_antenna_mode = ANT_A; - if (priv->bTxRxAntInv == true) - priv->byRxAntennaMode = ANT_B; + if (priv->tx_rx_ant_inv == true) + priv->rx_antenna_mode = ANT_B; else - priv->byRxAntennaMode = ANT_A; + priv->rx_antenna_mode = ANT_A; } else { - priv->byTxAntennaMode = ANT_B; + priv->tx_antenna_mode = ANT_B; - if (priv->bTxRxAntInv == true) - priv->byRxAntennaMode = ANT_A; + if (priv->tx_rx_ant_inv == true) + priv->rx_antenna_mode = ANT_A; else - priv->byRxAntennaMode = ANT_B; + priv->rx_antenna_mode = ANT_B; } } /* Set initial antenna mode */ - vnt_set_antenna_mode(priv, priv->byRxAntennaMode); + vnt_set_antenna_mode(priv, priv->rx_antenna_mode); /* get Auto Fall Back type */ priv->byAutoFBCtrl = AUTO_FB_0; @@ -348,9 +348,9 @@ static int device_init_registers(struct vnt_private *priv) vnt_set_short_slot_time(priv); - priv->byRadioCtl = priv->abyEEPROM[EEP_OFS_RADIOCTL]; + priv->radio_ctl = priv->abyEEPROM[EEP_OFS_RADIOCTL]; - if ((priv->byRadioCtl & EEP_RADIOCTL_ENABLE) != 0) { + if ((priv->radio_ctl & EEP_RADIOCTL_ENABLE) != 0) { status = vnt_control_in(priv, MESSAGE_TYPE_READ, MAC_REG_GPIOCTL1, MESSAGE_REQUEST_MACREG, 1, &tmp); |