[PATCH 034/166] staging: rtl8192e: Convert typedef ACM to struct acm

Larry Finger Larry.Finger at lwfinger.net
Thu Aug 25 04:47:41 UTC 2011


Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
---
 drivers/staging/rtl8192e/r8192E_dev.c  |    6 +++---
 drivers/staging/rtl8192e/rtl819x_Qos.h |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c
index 9bff1d0..2b3da4d 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/r8192E_dev.c
@@ -236,13 +236,13 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 			u8	pAcParam = *((u8*)val);
 			u32	eACI = pAcParam;
 			PACI_AIFSN	pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);
-			u8		ACM = pAciAifsn->f.ACM;
+			u8		acm = pAciAifsn->f.acm;
 			u8		AcmCtrl = read_nic_byte( dev, AcmHwCtrl);
 
 			RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n", __func__,eACI);
 			AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2)?0x0:0x1);
 
-			if ( ACM )
+			if (acm)
 			{
 				switch (eACI)
 				{
@@ -259,7 +259,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 					break;
 
 				default:
-					RT_TRACE( COMP_QOS, "SetHwReg8185(): [HW_VAR_ACM_CTRL] ACM set failed: eACI is %d\n", eACI );
+					RT_TRACE( COMP_QOS, "SetHwReg8185(): [HW_VAR_ACM_CTRL] acm set failed: eACI is %d\n", eACI );
 					break;
 				}
 			}
diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl8192e/rtl819x_Qos.h
index 93a9c13..1a85a9c 100644
--- a/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -228,11 +228,11 @@ typedef	enum _ACM_METHOD{
 }ACM_METHOD,*PACM_METHOD;
 
 
-typedef struct _ACM{
+struct acm {
 	u64		UsedTime;
 	u64		MediumTime;
 	u8		HwAcmCtl;
-}ACM, *PACM;
+};//, *struct acm *;
 
 
 
@@ -329,7 +329,7 @@ struct sta_qos {
 	u8 *				pWMMInfoEle;
 	u8				WMMParamEle[WMM_PARAM_ELEMENT_SIZE];
 
-	ACM				acm[4];
+	struct acm acm[4];
 	ACM_METHOD		AcmMethod;
 
 	struct qos_tstream StaTsArray[MAX_STA_TS_COUNT];
@@ -380,7 +380,7 @@ typedef	union _ACI_AIFSN{
 	struct
 	{
 		u8	AIFSN:4;
-		u8	ACM:1;
+		u8	acm:1;
 		u8	ACI:2;
 		u8	Reserved:1;
 	}f;
-- 
1.7.3.4




More information about the devel mailing list