Signed-off-by: Tommaso Merciai <tomm.merciai@xxxxxxxxx> --- drivers/staging/vt6655/baseband.c | 48 ++++++++++++++-------------- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 170c4056946f..55bddbda50cd 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2021,10 +2021,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if ((by_rf_type == RF_AIROHA) || (by_rf_type == RF_AL2230S)) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++) result &= bb_write_embedded(priv, @@ -2039,10 +2039,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if (by_rf_type == RF_UW2451) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) result &= bb_write_embedded(priv, @@ -2061,10 +2061,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -60; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -60; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; } else if (by_rf_type == RF_UW2452) { for (ii = 0; ii < CB_VT3253B0_INIT_FOR_UW2451; ii++) result &= bb_write_embedded(priv, @@ -2107,10 +2107,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x0A; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -60; - priv->ldBmThreshold[1] = -50; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -60; + priv->ld_bm_threshold[1] = -50; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* }} RobertYu */ } else if (by_rf_type == RF_VT3226) { @@ -2127,10 +2127,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* Fix VT3226 DFC system timing issue */ MACvSetRFLE_LatchBase(iobase); /* {{ RobertYu: 20050104 */ @@ -2161,10 +2161,10 @@ bool bb_vt3253_init(struct vnt_private *priv) priv->abyBBVGA[1] = 0x10; priv->abyBBVGA[2] = 0x0; priv->abyBBVGA[3] = 0x0; - priv->ldBmThreshold[0] = -70; - priv->ldBmThreshold[1] = -48; - priv->ldBmThreshold[2] = 0; - priv->ldBmThreshold[3] = 0; + priv->ld_bm_threshold[0] = -70; + priv->ld_bm_threshold[1] = -48; + priv->ld_bm_threshold[2] = 0; + priv->ld_bm_threshold[3] = 0; /* }} RobertYu */ } else { /* No VGA Table now */ diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 63aa62e483c8..876472862520 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -253,7 +253,7 @@ struct vnt_private { unsigned char byBBVGANew; unsigned char byBBVGACurrent; unsigned char abyBBVGA[BB_VGA_LEVEL]; - long ldBmThreshold[BB_VGA_LEVEL]; + long ld_bm_threshold[BB_VGA_LEVEL]; unsigned char byBBPreEDRSSI; unsigned char byBBPreEDIndex; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 8ae0fbfd134f..c4384b232c33 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -986,7 +986,7 @@ static void vnt_check_bb_vga(struct vnt_private *priv) RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, &dbm); for (i = 0; i < BB_VGA_LEVEL; i++) { - if (dbm < priv->ldBmThreshold[i]) { + if (dbm < priv->ld_bm_threshold[i]) { priv->byBBVGANew = priv->abyBBVGA[i]; break; } -- 2.25.1