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

staging: vt6655: change typedef enum _VIA_PKT_TYPE to macro 



Replacing for u8 type and removing cast for byBBType.

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

drivers/staging/vt6655/device.h

+10 −13
Original line number Diff line number Diff line
@@ -153,13 +153,10 @@ 
#define BB_TYPE_11G    2



/* 0:11a, 1:11b, 2:11gb (only CCK in BasicRate), 3:11ga (OFDM in BasicRate) */

typedef enum _VIA_PKT_TYPE

{

	PK_TYPE_11A = 0,

	PK_TYPE_11B,

	PK_TYPE_11GB,

	PK_TYPE_11GA

} VIA_PKT_TYPE, *PVIA_PKT_TYPE;

#define PK_TYPE_11A     0

#define PK_TYPE_11B     1

#define PK_TYPE_11GB    2

#define PK_TYPE_11GA    3



typedef struct __chip_info_tbl {

	CHIP_TYPE   chip_id;
@@ -319,7 +316,7 @@ struct vnt_private { 
	unsigned char byCWMaxMin;



	u8		byBBType; /* 0:11A, 1:11B, 2:11G */

	VIA_PKT_TYPE            byPacketType; /*

	u8		byPacketType; /*

				       * 0:11a,1:11b,2:11gb (only CCK

				       * in BasicRate), 3:11ga (OFDM in

				       * Basic Rate)

drivers/staging/vt6655/device_main.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ device_set_options(struct vnt_private *pDevice) 
	pDevice->byLongRetryLimit = pDevice->sOpts.long_retry;

	pDevice->bDiversityRegCtlON = (pDevice->sOpts.flags & DEVICE_FLAGS_DiversityANT) ? 1 : 0;

	pDevice->byBBType = pDevice->sOpts.bbp_type;

	pDevice->byPacketType = (VIA_PKT_TYPE)pDevice->byBBType;

	pDevice->byPacketType = pDevice->byBBType;

	pDevice->byAutoFBCtrl = AUTO_FB_0;

	pDevice->bUpdateBBVGA = true;

	pDevice->byPreambleType = 0;