Staging: bcm: Remove typedef for _stConvergenceSLTypes and call directly.

This patch removes typedef for _stConvergenceSLTypes,
changes the name of the struct to
bcm_convergence_types, and updates the
comments appropriately. In addition, any
calls to typedefs "stConvergenceSLTypes,
CConvergenceSLTypes, and *pstConvergenceSLTypes"
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 10 insertions, 12 deletions

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index af7f7c6e6f66..325b592fd41f 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -235,7 +235,7 @@ void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, B_UINT16 TID, BOOLEA
  * @ingroup ctrl_pkt_functions
  * copy classifier rule into the specified SF index
  */
-static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, stConvergenceSLTypes  *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
+static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, struct bcm_convergence_types *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
 {
         struct bcm_classifier_rule *pstClassifierEntry = NULL;
         /* VOID *pvPhsContext = NULL; */
@@ -439,7 +439,7 @@ static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer
         enum E_CLASSIFIER_ACTION eClassifierAction = eInvalidClassifierAction;
         B_UINT16 u16PacketClassificationRuleIndex = 0;
         int i;
-        stConvergenceSLTypes *psfCSType = NULL;
+        struct bcm_convergence_types *psfCSType = NULL;
         S_PHS_RULE sPhsRule;
         USHORT uVCID = Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value;
         UINT UGIValue = 0;
@@ -915,7 +915,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
         if (!pstAddIndication->sfAuthorizedSet.bValid)
                 pstAddIndication->sfAuthorizedSet.bValid = 1;
         for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++) {
-                stConvergenceSLTypes *psfCSType = NULL;
+                struct bcm_convergence_types *psfCSType = NULL;
                 psfCSType =  &pstAddIndication->sfAuthorizedSet.cConvergenceSLTypes[nIndex];
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "psfCSType = %p", psfCSType);
@@ -1059,7 +1059,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                 nCurClassifierCnt = MAX_CLASSIFIERS_IN_SF;
 
         for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++) {
-                stConvergenceSLTypes *psfCSType = NULL;
+                struct bcm_convergence_types *psfCSType = NULL;
 
                 psfCSType =  &pstAddIndication->sfAdmittedSet.cConvergenceSLTypes[nIndex];
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " CCPacketClassificationRuleSI====>");
@@ -1198,7 +1198,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                 nCurClassifierCnt = MAX_CLASSIFIERS_IN_SF;
 
         for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++)  {
-                stConvergenceSLTypes *psfCSType = NULL;
+                struct bcm_convergence_types *psfCSType = NULL;
 
                 psfCSType =  &pstAddIndication->sfActiveSet.cConvergenceSLTypes[nIndex];
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " CCPacketClassificationRuleSI====>");
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 369425528e49..1bf4780b32bf 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -122,8 +122,7 @@ typedef struct _stPhsRuleSI {
 } stPhsRuleSI, *pstPhsRuleSI;
 typedef stPhsRuleSI CPhsRuleSI;
 
-/* brief structure cConvergenceSLTypes */
-struct _stConvergenceSLTypes {
+struct bcm_convergence_types {
         /* 8bit Phs Classfier Action Of The Service Flow */
         B_UINT8 u8ClassfierDSCAction;
         /* 8bit Phs DSC Action Of The Service Flow */
@@ -135,7 +134,6 @@ struct _stConvergenceSLTypes {
         /* brief class CPhsRuleSI */
         struct _stPhsRuleSI cPhsRule;
 };
-typedef struct _stConvergenceSLTypes stConvergenceSLTypes, CConvergenceSLTypes, *pstConvergenceSLTypes;
 
 struct bcm_connect_mgr_params {
         /* 32bitSFID Of The Service Flow */
@@ -251,10 +249,10 @@ struct bcm_connect_mgr_params {
         B_UINT8 u8TotalClassifiers;  /* < Total number of valid classifiers */
         B_UINT8 bValid; /* < Validity flag */
         B_UINT8 u8Padding;       /* < Padding byte */
-/*
- * Structure for Convergence SubLayer Types with a maximum of 4 classifiers
- */
-        stConvergenceSLTypes cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF];
+        /*
+         * Structure for Convergence SubLayer Types with a maximum of 4 classifiers
+         */
+        struct bcm_convergence_types cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF];
 };
 
 struct bcm_add_request {