From bf8918de79b98f647bb2927b5935de09ed091b12 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Fri, 7 Nov 2014 19:06:08 +0000 Subject: [PATCH] staging: vt6655: change typedef enum _VIA_PKT_TYPE to macro Replacing for u8 type and removing cast for byBBType. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device.h | 23 ++++++++++------------- drivers/staging/vt6655/device_main.c | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 3742d8d6764a..55aa48b63b12 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -152,14 +152,11 @@ #define BB_TYPE_11B 1 #define BB_TYPE_11G 2 -/* 0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate) */ -typedef enum _VIA_PKT_TYPE -{ - PK_TYPE_11A = 0, - PK_TYPE_11B, - PK_TYPE_11GB, - PK_TYPE_11GA -} VIA_PKT_TYPE, *PVIA_PKT_TYPE; +/* 0:11a, 1:11b, 2:11gb (only CCK in BasicRate), 3:11ga (OFDM in BasicRate) */ +#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,11 +316,11 @@ struct vnt_private { unsigned char byCWMaxMin; u8 byBBType; /* 0:11A, 1:11B, 2:11G */ - VIA_PKT_TYPE byPacketType; /* - * 0:11a,1:11b,2:11gb (only CCK - * in BasicRate), 3:11ga (OFDM in - * Basic Rate) - */ + u8 byPacketType; /* + * 0:11a,1:11b,2:11gb (only CCK + * in BasicRate), 3:11ga (OFDM in + * Basic Rate) + */ unsigned short wBasicRate; unsigned char byACKRate; unsigned char byTopOFDMBasicRate; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 22a55f4a9962..2e3178429437 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -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; -- 2.11.0