Commit c37cbd37 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: struct vnt_private replace abyBBVGA with bb_vga 



Removing type prefix and camel case.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6177aef

drivers/staging/vt6656/baseband.c

+17 −17
Original line number Diff line number Diff line
@@ -406,10 +406,10 @@ int vnt_vt3184_init(struct vnt_private *priv) 
		agc = vnt_vt3184_agc;

		length_agc = sizeof(vnt_vt3184_agc);



		priv->abyBBVGA[0] = 0x1C;

		priv->abyBBVGA[1] = 0x10;

		priv->abyBBVGA[2] = 0x0;

		priv->abyBBVGA[3] = 0x0;

		priv->bb_vga[0] = 0x1C;

		priv->bb_vga[1] = 0x10;

		priv->bb_vga[2] = 0x0;

		priv->bb_vga[3] = 0x0;

		priv->ldBmThreshold[0] = -70;

		priv->ldBmThreshold[1] = -48;

		priv->ldBmThreshold[2] = 0;
@@ -423,10 +423,10 @@ int vnt_vt3184_init(struct vnt_private *priv) 


		addr[0xd7] = 0x06;



		priv->abyBBVGA[0] = 0x1c;

		priv->abyBBVGA[1] = 0x10;

		priv->abyBBVGA[2] = 0x0;

		priv->abyBBVGA[3] = 0x0;

		priv->bb_vga[0] = 0x1c;

		priv->bb_vga[1] = 0x10;

		priv->bb_vga[2] = 0x0;

		priv->bb_vga[3] = 0x0;

		priv->ldBmThreshold[0] = -70;

		priv->ldBmThreshold[1] = -48;

		priv->ldBmThreshold[2] = 0;
@@ -439,10 +439,10 @@ int vnt_vt3184_init(struct vnt_private *priv) 
		agc = vnt_vt3184_agc;

		length_agc = sizeof(vnt_vt3184_agc);



		priv->abyBBVGA[0] = 0x20;

		priv->abyBBVGA[1] = 0x10;

		priv->abyBBVGA[2] = 0x0;

		priv->abyBBVGA[3] = 0x0;

		priv->bb_vga[0] = 0x20;

		priv->bb_vga[1] = 0x10;

		priv->bb_vga[2] = 0x0;

		priv->bb_vga[3] = 0x0;

		priv->ldBmThreshold[0] = -70;

		priv->ldBmThreshold[1] = -48;

		priv->ldBmThreshold[2] = 0;
@@ -457,10 +457,10 @@ int vnt_vt3184_init(struct vnt_private *priv) 
		agc = vnt_vt3184_agc;

		length_agc = sizeof(vnt_vt3184_agc);



		priv->abyBBVGA[0] = 0x20;

		priv->abyBBVGA[1] = 0x10;

		priv->abyBBVGA[2] = 0x0;

		priv->abyBBVGA[3] = 0x0;

		priv->bb_vga[0] = 0x20;

		priv->bb_vga[1] = 0x10;

		priv->bb_vga[2] = 0x0;

		priv->bb_vga[3] = 0x0;

		priv->ldBmThreshold[0] = -70;

		priv->ldBmThreshold[1] = -48;

		priv->ldBmThreshold[2] = 0;
@@ -533,7 +533,7 @@ void vnt_set_short_slot_time(struct vnt_private *priv) 


	vnt_control_in_u8(priv, MESSAGE_REQUEST_BBREG, 0xe7, &bb_vga);



	if (bb_vga == priv->abyBBVGA[0])

	if (bb_vga == priv->bb_vga[0])

		priv->bb_rx_conf |= 0x20;



	vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x0a, priv->bb_rx_conf);

drivers/staging/vt6656/card.c

+9 −9
Original line number Diff line number Diff line
@@ -807,25 +807,25 @@ void vnt_set_bss_mode(struct vnt_private *priv) 


	if (priv->bb_type == BB_TYPE_11A) {

		if (priv->rf_type == RF_AIROHA7230) {

			priv->abyBBVGA[0] = 0x20;

			priv->bb_vga[0] = 0x20;



			vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,

						0xe7, priv->abyBBVGA[0]);

						0xe7, priv->bb_vga[0]);

		}



		priv->abyBBVGA[2] = 0x10;

		priv->abyBBVGA[3] = 0x10;

		priv->bb_vga[2] = 0x10;

		priv->bb_vga[3] = 0x10;

	} else {

		if (priv->rf_type == RF_AIROHA7230) {

			priv->abyBBVGA[0] = 0x1c;

			priv->bb_vga[0] = 0x1c;



			vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG,

						0xe7, priv->abyBBVGA[0]);

						0xe7, priv->bb_vga[0]);

		}



		priv->abyBBVGA[2] = 0x0;

		priv->abyBBVGA[3] = 0x0;

		priv->bb_vga[2] = 0x0;

		priv->bb_vga[3] = 0x0;

	}



	vnt_set_vga_gain_offset(priv, priv->abyBBVGA[0]);

	vnt_set_vga_gain_offset(priv, priv->bb_vga[0]);

}

drivers/staging/vt6656/device.h

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ struct vnt_private { 
	u8 auto_fb_ctrl;



	/* For Update BaseBand VGA Gain Offset */

	u8 abyBBVGA[BB_VGA_LEVEL];

	u8 bb_vga[BB_VGA_LEVEL];

	signed long ldBmThreshold[BB_VGA_LEVEL];



	u8 byBBPreEDRSSI;

drivers/staging/vt6656/main_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, 
			priv->short_slot_time = false;



		vnt_set_short_slot_time(priv);

		vnt_set_vga_gain_offset(priv, priv->abyBBVGA[0]);

		vnt_set_vga_gain_offset(priv, priv->bb_vga[0]);

		vnt_update_pre_ed_threshold(priv, false);

	}