Commit eb507641 authored by Pavan Bobba's avatar Pavan Bobba Committed by Greg Kroah-Hartman

staging: vt6655: Type encoding info dropped from variable "byRFType"

variable name "byRFType" updated like below:

a.type encoding info dropped from name
b.camelcase name replaced by snakecase

Issue found by checkpatch
Signed-off-by: default avatarPavan Bobba <opensource206@gmail.com>
Tested-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/ZQwyRXFHA9hTLcyv@ubuntu.myguest.virtualbox.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31f91255
...@@ -1979,7 +1979,7 @@ bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr, ...@@ -1979,7 +1979,7 @@ bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr,
* In: * In:
* iobase - I/O base address * iobase - I/O base address
* byRevId - Revision ID * byRevId - Revision ID
* byRFType - RF type * rf_type - RF type
* Out: * Out:
* none * none
* *
...@@ -1992,10 +1992,10 @@ bool bb_vt3253_init(struct vnt_private *priv) ...@@ -1992,10 +1992,10 @@ bool bb_vt3253_init(struct vnt_private *priv)
bool result = true; bool result = true;
int ii; int ii;
void __iomem *iobase = priv->port_offset; void __iomem *iobase = priv->port_offset;
unsigned char by_rf_type = priv->byRFType; unsigned char rf_type = priv->rf_type;
unsigned char by_local_id = priv->local_id; unsigned char by_local_id = priv->local_id;
if (by_rf_type == RF_RFMD2959) { if (rf_type == RF_RFMD2959) {
if (by_local_id <= REV_ID_VT3253_A1) { if (by_local_id <= REV_ID_VT3253_A1) {
for (ii = 0; ii < CB_VT3253_INIT_FOR_RFMD; ii++) for (ii = 0; ii < CB_VT3253_INIT_FOR_RFMD; ii++)
result &= bb_write_embedded(priv, result &= bb_write_embedded(priv,
...@@ -2024,7 +2024,7 @@ bool bb_vt3253_init(struct vnt_private *priv) ...@@ -2024,7 +2024,7 @@ bool bb_vt3253_init(struct vnt_private *priv)
priv->dbm_threshold[1] = -50; priv->dbm_threshold[1] = -50;
priv->dbm_threshold[2] = 0; priv->dbm_threshold[2] = 0;
priv->dbm_threshold[3] = 0; priv->dbm_threshold[3] = 0;
} else if ((by_rf_type == RF_AIROHA) || (by_rf_type == RF_AL2230S)) { } else if ((rf_type == RF_AIROHA) || (rf_type == RF_AL2230S)) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)
result &= bb_write_embedded(priv, result &= bb_write_embedded(priv,
vt3253b0_airoha2230[ii][0], vt3253b0_airoha2230[ii][0],
...@@ -2042,7 +2042,7 @@ bool bb_vt3253_init(struct vnt_private *priv) ...@@ -2042,7 +2042,7 @@ bool bb_vt3253_init(struct vnt_private *priv)
priv->dbm_threshold[1] = -48; priv->dbm_threshold[1] = -48;
priv->dbm_threshold[2] = 0; priv->dbm_threshold[2] = 0;
priv->dbm_threshold[3] = 0; priv->dbm_threshold[3] = 0;
} else if (by_rf_type == RF_UW2451) { } else if (rf_type == RF_UW2451) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++)
result &= bb_write_embedded(priv, result &= bb_write_embedded(priv,
vt3253b0_uw2451[ii][0], vt3253b0_uw2451[ii][0],
...@@ -2064,7 +2064,7 @@ bool bb_vt3253_init(struct vnt_private *priv) ...@@ -2064,7 +2064,7 @@ bool bb_vt3253_init(struct vnt_private *priv)
priv->dbm_threshold[1] = -50; priv->dbm_threshold[1] = -50;
priv->dbm_threshold[2] = 0; priv->dbm_threshold[2] = 0;
priv->dbm_threshold[3] = 0; priv->dbm_threshold[3] = 0;
} else if (by_rf_type == RF_VT3226) { } else if (rf_type == RF_VT3226) {
for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)
result &= bb_write_embedded(priv, result &= bb_write_embedded(priv,
vt3253b0_airoha2230[ii][0], vt3253b0_airoha2230[ii][0],
......
...@@ -228,7 +228,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) ...@@ -228,7 +228,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
} }
} }
if (priv->byRFType == RF_RFMD2959) { if (priv->rf_type == RF_RFMD2959) {
/* /*
* bcs TX_PE will reserve 3 us hardware's processing * bcs TX_PE will reserve 3 us hardware's processing
* time here is 2 us. * time here is 2 us.
...@@ -356,7 +356,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv) ...@@ -356,7 +356,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv)
if (priv->radio_off) if (priv->radio_off)
return; return;
switch (priv->byRFType) { switch (priv->rf_type) {
case RF_RFMD2959: case RF_RFMD2959:
vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL, vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL,
SOFTPWRCTL_TXPEINV); SOFTPWRCTL_TXPEINV);
......
...@@ -101,12 +101,12 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) ...@@ -101,12 +101,12 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
*/ */
priv->byCurrentCh = ch->hw_value; priv->byCurrentCh = ch->hw_value;
ret &= RFbSelectChannel(priv, priv->byRFType, ret &= RFbSelectChannel(priv, priv->rf_type,
ch->hw_value); ch->hw_value);
/* Init Synthesizer Table */ /* Init Synthesizer Table */
if (priv->bEnablePSMode) if (priv->bEnablePSMode)
rf_write_wake_prog_syn(priv, priv->byRFType, ch->hw_value); rf_write_wake_prog_syn(priv, priv->rf_type, ch->hw_value);
bb_software_reset(priv); bb_software_reset(priv);
......
...@@ -153,7 +153,7 @@ struct vnt_private { ...@@ -153,7 +153,7 @@ struct vnt_private {
/* Version control */ /* Version control */
unsigned char local_id; unsigned char local_id;
unsigned char byRFType; unsigned char rf_type;
unsigned char max_pwr_level; unsigned char max_pwr_level;
unsigned char byZoneType; unsigned char byZoneType;
......
...@@ -1792,10 +1792,10 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) ...@@ -1792,10 +1792,10 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
vt6655_mac_read_ether_addr(priv->port_offset, priv->abyCurrentNetAddr); vt6655_mac_read_ether_addr(priv->port_offset, priv->abyCurrentNetAddr);
/* Get RFType */ /* Get RFType */
priv->byRFType = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RFTYPE); priv->rf_type = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RFTYPE);
priv->byRFType &= RF_MASK; priv->rf_type &= RF_MASK;
dev_dbg(&pcid->dev, "RF Type = %x\n", priv->byRFType); dev_dbg(&pcid->dev, "RF Type = %x\n", priv->rf_type);
device_get_options(priv); device_get_options(priv);
device_set_options(priv); device_set_options(priv);
......
...@@ -268,7 +268,7 @@ static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byCha ...@@ -268,7 +268,7 @@ static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byCha
* Parameters: * Parameters:
* In: * In:
* byBBType * byBBType
* byRFType * rf_type
* Out: * Out:
* none * none
* *
...@@ -279,7 +279,7 @@ bool RFbInit(struct vnt_private *priv) ...@@ -279,7 +279,7 @@ bool RFbInit(struct vnt_private *priv)
{ {
bool ret = true; bool ret = true;
switch (priv->byRFType) { switch (priv->rf_type) {
case RF_AIROHA: case RF_AIROHA:
case RF_AL2230S: case RF_AL2230S:
priv->max_pwr_level = AL2230_PWR_IDX_LEN; priv->max_pwr_level = AL2230_PWR_IDX_LEN;
...@@ -300,7 +300,7 @@ bool RFbInit(struct vnt_private *priv) ...@@ -300,7 +300,7 @@ bool RFbInit(struct vnt_private *priv)
* *
* Parameters: * Parameters:
* In: * In:
* byRFType * rf_type
* byChannel - Channel number * byChannel - Channel number
* Out: * Out:
* none * none
...@@ -308,12 +308,12 @@ bool RFbInit(struct vnt_private *priv) ...@@ -308,12 +308,12 @@ bool RFbInit(struct vnt_private *priv)
* Return Value: true if succeeded; false if failed. * Return Value: true if succeeded; false if failed.
* *
*/ */
bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, bool RFbSelectChannel(struct vnt_private *priv, unsigned char rf_type,
u16 byChannel) u16 byChannel)
{ {
bool ret = true; bool ret = true;
switch (byRFType) { switch (rf_type) {
case RF_AIROHA: case RF_AIROHA:
case RF_AL2230S: case RF_AL2230S:
ret = RFbAL2230SelectChannel(priv, byChannel); ret = RFbAL2230SelectChannel(priv, byChannel);
...@@ -470,7 +470,7 @@ bool RFbRawSetPower(struct vnt_private *priv, unsigned char byPwr, ...@@ -470,7 +470,7 @@ bool RFbRawSetPower(struct vnt_private *priv, unsigned char byPwr,
if (byPwr >= priv->max_pwr_level) if (byPwr >= priv->max_pwr_level)
return false; return false;
switch (priv->byRFType) { switch (priv->rf_type) {
case RF_AIROHA: case RF_AIROHA:
ret &= IFRFbWriteEmbedded(priv, al2230_power_table[byPwr]); ret &= IFRFbWriteEmbedded(priv, al2230_power_table[byPwr]);
if (rate <= RATE_11M) if (rate <= RATE_11M)
...@@ -521,7 +521,7 @@ RFvRSSITodBm(struct vnt_private *priv, unsigned char byCurrRSSI, long *pldBm) ...@@ -521,7 +521,7 @@ RFvRSSITodBm(struct vnt_private *priv, unsigned char byCurrRSSI, long *pldBm)
long a = 0; long a = 0;
unsigned char abyAIROHARF[4] = {0, 18, 0, 40}; unsigned char abyAIROHARF[4] = {0, 18, 0, 40};
switch (priv->byRFType) { switch (priv->rf_type) {
case RF_AIROHA: case RF_AIROHA:
case RF_AL2230S: case RF_AL2230S:
a = abyAIROHARF[byIdx]; a = abyAIROHARF[byIdx];
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData); bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData);
bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, u16 byChannel); bool RFbSelectChannel(struct vnt_private *priv, unsigned char rf_type, u16 byChannel);
bool RFbInit(struct vnt_private *priv); bool RFbInit(struct vnt_private *priv);
bool rf_write_wake_prog_syn(struct vnt_private *priv, unsigned char rf_type, u16 channel); bool rf_write_wake_prog_syn(struct vnt_private *priv, unsigned char rf_type, u16 channel);
bool RFbSetPower(struct vnt_private *priv, unsigned int rate, u16 uCH); bool RFbSetPower(struct vnt_private *priv, unsigned int rate, u16 uCH);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment