]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: vt6656: struct vnt_private replace abyEEPROM with eeprom
authorMalcolm Priestley <tvboxspy@gmail.com>
Sun, 20 Jul 2014 14:33:16 +0000 (15:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 19:16:28 +0000 (12:16 -0700)
Removing type prefix and camel case.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/baseband.c
drivers/staging/vt6656/device.h
drivers/staging/vt6656/main_usb.c

index 6af9fcbd90bd0330a3cafd3b363188719ef42b8b..9598c1991f294fbea25ea1713d4693822c5c64fc 100644 (file)
@@ -390,11 +390,11 @@ int vnt_vt3184_init(struct vnt_private *priv)
 
        status = vnt_control_in(priv, MESSAGE_TYPE_READ, 0,
                MESSAGE_REQUEST_EEPROM, EEP_MAX_CONTEXT_SIZE,
-                                               priv->abyEEPROM);
+                                               priv->eeprom);
        if (status != STATUS_SUCCESS)
                return false;
 
-       priv->rf_type = priv->abyEEPROM[EEP_OFS_RFTYPE];
+       priv->rf_type = priv->eeprom[EEP_OFS_RFTYPE];
 
        dev_dbg(&priv->usb->dev, "RF Type %d\n", priv->rf_type);
 
index dcb57dcb730846cfe5cb1fe31cfb54edb5f6576c..07e9d037ca579e39d3249fda1c418ccb6d624cb0 100644 (file)
@@ -336,7 +336,7 @@ struct vnt_private {
        u8 top_ofdm_basic_rate;
        u8 top_cck_basic_rate;
 
-       u8 abyEEPROM[EEP_MAX_CONTEXT_SIZE];  /*u32 alignment */
+       u8 eeprom[EEP_MAX_CONTEXT_SIZE];  /*u32 alignment */
 
        u8 byPreambleType;
 
index f5227eea528dbce40127fcfc5c99e5322aa37d8e..4054e36827826c649a3c3b3954797f12621da054 100644 (file)
@@ -201,17 +201,17 @@ static int device_init_registers(struct vnt_private *priv)
        /* target to IF pin while programming to RF chip */
        priv->byCurPwr = 0xFF;
 
-       priv->byCCKPwr = priv->abyEEPROM[EEP_OFS_PWR_CCK];
-       priv->byOFDMPwrG = priv->abyEEPROM[EEP_OFS_PWR_OFDMG];
+       priv->byCCKPwr = priv->eeprom[EEP_OFS_PWR_CCK];
+       priv->byOFDMPwrG = priv->eeprom[EEP_OFS_PWR_OFDMG];
        /* load power table */
        for (ii = 0; ii < 14; ii++) {
                priv->abyCCKPwrTbl[ii] =
-                       priv->abyEEPROM[ii + EEP_OFS_CCK_PWR_TBL];
+                       priv->eeprom[ii + EEP_OFS_CCK_PWR_TBL];
 
                if (priv->abyCCKPwrTbl[ii] == 0)
                        priv->abyCCKPwrTbl[ii] = priv->byCCKPwr;
                priv->abyOFDMPwrTbl[ii] =
-                               priv->abyEEPROM[ii + EEP_OFS_OFDM_PWR_TBL];
+                               priv->eeprom[ii + EEP_OFS_OFDM_PWR_TBL];
                if (priv->abyOFDMPwrTbl[ii] == 0)
                        priv->abyOFDMPwrTbl[ii] = priv->byOFDMPwrG;
        }
@@ -230,13 +230,13 @@ static int device_init_registers(struct vnt_private *priv)
        /* load OFDM A power table */
        for (ii = 0; ii < CB_MAX_CHANNEL_5G; ii++) {
                priv->abyOFDMAPwrTbl[ii] =
-                       priv->abyEEPROM[ii + EEP_OFS_OFDMA_PWR_TBL];
+                       priv->eeprom[ii + EEP_OFS_OFDMA_PWR_TBL];
 
                if (priv->abyOFDMAPwrTbl[ii] == 0)
                        priv->abyOFDMAPwrTbl[ii] = priv->byOFDMPwrA;
        }
 
-       antenna = priv->abyEEPROM[EEP_OFS_ANTENNA];
+       antenna = priv->eeprom[EEP_OFS_ANTENNA];
 
        if (antenna & EEP_ANTINV)
                priv->tx_rx_ant_inv = true;
@@ -290,12 +290,12 @@ static int device_init_registers(struct vnt_private *priv)
 
        /* load vt3266 calibration parameters in EEPROM */
        if (priv->rf_type == RF_VT3226D0) {
-               if ((priv->abyEEPROM[EEP_OFS_MAJOR_VER] == 0x1) &&
-                   (priv->abyEEPROM[EEP_OFS_MINOR_VER] >= 0x4)) {
+               if ((priv->eeprom[EEP_OFS_MAJOR_VER] == 0x1) &&
+                   (priv->eeprom[EEP_OFS_MINOR_VER] >= 0x4)) {
 
-                       calib_tx_iq = priv->abyEEPROM[EEP_OFS_CALIB_TX_IQ];
-                       calib_tx_dc = priv->abyEEPROM[EEP_OFS_CALIB_TX_DC];
-                       calib_rx_iq = priv->abyEEPROM[EEP_OFS_CALIB_RX_IQ];
+                       calib_tx_iq = priv->eeprom[EEP_OFS_CALIB_TX_IQ];
+                       calib_tx_dc = priv->eeprom[EEP_OFS_CALIB_TX_DC];
+                       calib_rx_iq = priv->eeprom[EEP_OFS_CALIB_RX_IQ];
                        if (calib_tx_iq || calib_tx_dc || calib_rx_iq) {
                                /* CR255, enable TX/RX IQ and
                                   DC compensation mode */
@@ -348,7 +348,7 @@ static int device_init_registers(struct vnt_private *priv)
 
        vnt_set_short_slot_time(priv);
 
-       priv->radio_ctl = priv->abyEEPROM[EEP_OFS_RADIOCTL];
+       priv->radio_ctl = priv->eeprom[EEP_OFS_RADIOCTL];
 
        if ((priv->radio_ctl & EEP_RADIOCTL_ENABLE) != 0) {
                status = vnt_control_in(priv, MESSAGE_TYPE_READ,