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

This patch removes typedef for _stServiceFlowParamSI,
changes the name of the struct to
bcm_connect_mgr_params, and updates the
comments appropriately. In addition, any
calls to typedefs "stServiceFlowParamSI,
*pstServiceFlowParamSI, and CServiceFlowParamSI"
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>

5 files changed, 40 insertions, 64 deletions

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 96fd1586f085..af7f7c6e6f66 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -428,7 +428,7 @@ VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRu
  * @ingroup ctrl_pkt_functions
  */
 static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
-                        register pstServiceFlowParamSI psfLocalSet, /* <Pointer to the ServiceFlowParamSI structure */
+                        register struct bcm_connect_mgr_params *psfLocalSet, /* Pointer to the connection manager parameters structure */
                         register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */
                         register UCHAR ucDsxType,
                         stLocalSFAddIndicationAlt *pstAddIndication) {
@@ -1300,7 +1300,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
 
 static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer)
 {
-        UINT  nBytesToRead = sizeof(stServiceFlowParamSI);
+        UINT  nBytesToRead = sizeof(struct bcm_connect_mgr_params);
 
         if (ulAddrSFParamSet == 0 || NULL == pucDestBuffer) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Got Param address as 0!!");
@@ -1317,7 +1317,7 @@ static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAdd
 
 static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer, ULONG ulAddrSFParamSet)
 {
-        UINT nBytesToWrite = sizeof(stServiceFlowParamSI);
+        UINT nBytesToWrite = sizeof(struct bcm_connect_mgr_params);
         int ret = 0;
 
         if (ulAddrSFParamSet == 0 || NULL == pucSrcBuffer)
@@ -1370,7 +1370,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
                 return 0;
 
         /* AUTHORIZED SET */
-        pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)
+        pstAddIndication->psfAuthorizedSet = (struct bcm_connect_mgr_params *)
                         GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
         if (!pstAddIndication->psfAuthorizedSet) {
                 kfree(pstAddIndication);
@@ -1384,7 +1384,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
         }
 
         /* this can't possibly be right */
-        pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfAuthorizedSet);
+        pstAddIndication->psfAuthorizedSet = (struct bcm_connect_mgr_params *)ntohl((ULONG)pstAddIndication->psfAuthorizedSet);
 
         if (pstAddIndicationAlt->u8Type == DSA_REQ) {
                 struct bcm_add_request AddRequest;
@@ -1412,7 +1412,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
         pstAddIndication->u8CC = pstAddIndicationAlt->u8CC;
 
         /* ADMITTED SET */
-        pstAddIndication->psfAdmittedSet = (stServiceFlowParamSI *)
+        pstAddIndication->psfAdmittedSet = (struct bcm_connect_mgr_params *)
                 GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
         if (!pstAddIndication->psfAdmittedSet) {
                 kfree(pstAddIndication);
@@ -1423,10 +1423,10 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
                 return 0;
         }
 
-        pstAddIndication->psfAdmittedSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfAdmittedSet);
+        pstAddIndication->psfAdmittedSet = (struct bcm_connect_mgr_params *)ntohl((ULONG)pstAddIndication->psfAdmittedSet);
 
         /* ACTIVE SET */
-        pstAddIndication->psfActiveSet = (stServiceFlowParamSI *)
+        pstAddIndication->psfActiveSet = (struct bcm_connect_mgr_params *)
                 GetNextTargetBufferLocation(Adapter, pstAddIndicationAlt->u16TID);
         if (!pstAddIndication->psfActiveSet) {
                 kfree(pstAddIndication);
@@ -1437,7 +1437,7 @@ ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBu
                 return 0;
         }
 
-        pstAddIndication->psfActiveSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfActiveSet);
+        pstAddIndication->psfActiveSet = (struct bcm_connect_mgr_params *)ntohl((ULONG)pstAddIndication->psfActiveSet);
 
         (*puBufferLength) = sizeof(struct bcm_add_indication);
         *(struct bcm_add_indication *)pvBuffer = *pstAddIndication;
@@ -1539,7 +1539,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
         if (Adapter->astTargetDsxBuffer[0].ulTargetDsxBuffer)
                 return 1;
 
-        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Size of Each DSX Buffer(Also size of ServiceFlowParamSI): %zx ", sizeof(stServiceFlowParamSI));
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Size of Each DSX Buffer(Also size of connection manager parameters): %zx ", sizeof(struct bcm_connect_mgr_params));
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Reading DSX buffer From Target location %x ", DSX_MESSAGE_EXCHANGE_BUFFER);
 
         Status = rdmalt(Adapter, DSX_MESSAGE_EXCHANGE_BUFFER, (PUINT)&ulTargetDsxBuffersBase, sizeof(UINT));
@@ -1550,7 +1550,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
 
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Base Address Of DSX  Target Buffer : 0x%lx", ulTargetDsxBuffersBase);
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "Tgt Buffer is Now %lx :", ulTargetDsxBuffersBase);
-        ulCntTargetBuffers = DSX_MESSAGE_EXCHANGE_BUFFER_SIZE / sizeof(stServiceFlowParamSI);
+        ulCntTargetBuffers = DSX_MESSAGE_EXCHANGE_BUFFER_SIZE / sizeof(struct bcm_connect_mgr_params);
 
         Adapter->ulTotalTargetBuffersAvailable =
                 ulCntTargetBuffers > MAX_TARGET_DSX_BUFFERS ?
@@ -1562,7 +1562,7 @@ ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
                 Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer = ulTargetDsxBuffersBase;
                 Adapter->astTargetDsxBuffer[i].valid = 1;
                 Adapter->astTargetDsxBuffer[i].tid = 0;
-                ulTargetDsxBuffersBase += sizeof(stServiceFlowParamSI);
+                ulTargetDsxBuffersBase += sizeof(struct bcm_connect_mgr_params);
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "  Target DSX Buffer %lx setup at 0x%lx",
                                 i, Adapter->astTargetDsxBuffer[i].ulTargetDsxBuffer);
         }
@@ -1633,7 +1633,7 @@ int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
 BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer to the Adapter structure */
                                 PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */)
 {
-        stServiceFlowParamSI *psfLocalSet = NULL;
+        struct bcm_connect_mgr_params *psfLocalSet = NULL;
         stLocalSFAddIndicationAlt *pstAddIndication = NULL;
         stLocalSFChangeIndicationAlt *pstChangeIndication = NULL;
         struct bcm_leader *pLeader = NULL;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 4cc6f93f2321..1c5a07c7bbe2 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -35,8 +35,7 @@ typedef struct stLocalSFAddRequestAlt{
     B_UINT16                        u16VCID;
 
 
-        /// \brief structure ParameterSet
-    stServiceFlowParamSI              sfParameterSet;
+        struct bcm_connect_mgr_params sfParameterSet;
 
     //USE_MEMORY_MANAGER();
 }stLocalSFAddRequestAlt;
@@ -50,12 +49,9 @@ typedef struct stLocalSFAddIndicationAlt{
     B_UINT16                        u16CID;
     /// \brief 16bitVCID
     B_UINT16                        u16VCID;
-        /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-        /// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+        struct bcm_connect_mgr_params sfAuthorizedSet;
+        struct bcm_connect_mgr_params sfAdmittedSet;
+        struct bcm_connect_mgr_params sfActiveSet;
 
         B_UINT8                                                 u8CC;   /**<  Confirmation Code*/
         B_UINT8                                                 u8Padd;         /**<  8-bit Padding */
@@ -72,12 +68,9 @@ typedef struct stLocalSFAddConfirmationAlt{
     B_UINT16                        u16CID;
     /// \brief 16bitVCID
     B_UINT16                        u16VCID;
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+        struct bcm_connect_mgr_params sfAuthorizedSet;
+        struct bcm_connect_mgr_params sfAdmittedSet;
+        struct bcm_connect_mgr_params sfActiveSet;
 }stLocalSFAddConfirmationAlt;
 
 
@@ -91,16 +84,13 @@ typedef struct stLocalSFChangeRequestAlt{
     /// \brief 16bitVCID
     B_UINT16                        u16VCID;
         /*
-        //Pointer location at which following Service Flow param Structure can be read
-        //from the target. We get only the address location and we need to read out the
-        //entire SF param structure at the given location on target
+        //Pointer location at which following connection manager param Structure can be read
+        //from the target. We only get the address location and we need to read out the
+        //entire connection manager param structure at the given location on target
         */
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ParameterSet
-    stServiceFlowParamSI              sfActiveSet;
+        struct bcm_connect_mgr_params sfAuthorizedSet;
+        struct bcm_connect_mgr_params sfAdmittedSet;
+        struct bcm_connect_mgr_params sfActiveSet;
 
         B_UINT8                                                 u8CC;   /**<  Confirmation Code*/
         B_UINT8                                                 u8Padd;         /**<  8-bit Padding */
@@ -117,12 +107,9 @@ typedef struct stLocalSFChangeConfirmationAlt{
     B_UINT16                        u16CID;
     /// \brief 16bitVCID
     B_UINT16                        u16VCID;
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+        struct bcm_connect_mgr_params sfAuthorizedSet;
+        struct bcm_connect_mgr_params sfAdmittedSet;
+        struct bcm_connect_mgr_params sfActiveSet;
 
 }stLocalSFChangeConfirmationAlt;
 
@@ -135,12 +122,9 @@ typedef struct stLocalSFChangeIndicationAlt{
     B_UINT16                        u16CID;
     /// \brief 16bitVCID
     B_UINT16                        u16VCID;
-    /// \brief structure AuthorizedSet
-    stServiceFlowParamSI              sfAuthorizedSet;
-    /// \brief structure AdmittedSet
-    stServiceFlowParamSI              sfAdmittedSet;
-    /// \brief structure ActiveSet
-    stServiceFlowParamSI              sfActiveSet;
+        struct bcm_connect_mgr_params sfAuthorizedSet;
+        struct bcm_connect_mgr_params sfAdmittedSet;
+        struct bcm_connect_mgr_params sfActiveSet;
 
         B_UINT8                                                 u8CC;   /**<  Confirmation Code*/
         B_UINT8                                                 u8Padd;         /**<  8-bit Padding */
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 3c8cc5ba2e2e..3ec8f800a5b0 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -95,7 +95,7 @@ void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter);
 int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_info *psFwInfo);
 
 void CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter,
-                CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
+                struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex);
 
 VOID ResetCounters(struct bcm_mini_adapter *Adapter);
 
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 43d462e59088..369425528e49 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -137,8 +137,7 @@ struct _stConvergenceSLTypes {
 };
 typedef struct _stConvergenceSLTypes stConvergenceSLTypes, CConvergenceSLTypes, *pstConvergenceSLTypes;
 
-/* brief structure CServiceFlowParamSI */
-typedef struct _stServiceFlowParamSI {
+struct bcm_connect_mgr_params {
         /* 32bitSFID Of The Service Flow */
         B_UINT32 u32SFID;
         /* 32bit Maximum Sustained Traffic Rate of the Service Flow */
@@ -256,9 +255,7 @@ typedef struct _stServiceFlowParamSI {
  * Structure for Convergence SubLayer Types with a maximum of 4 classifiers
  */
         stConvergenceSLTypes cConvergenceSLTypes[MAX_CLASSIFIERS_IN_SF];
-
-} stServiceFlowParamSI, *pstServiceFlowParamSI;
-typedef stServiceFlowParamSI CServiceFlowParamSI;
+};
 
 struct bcm_add_request {
         B_UINT8 u8Type; /* < Type */
@@ -269,8 +266,7 @@ struct bcm_add_request {
         B_UINT16 u16CID; /* < 16bit CID */
         /* brief 16bitVCID */
         B_UINT16 u16VCID; /* < 16bit VCID */
-        /* brief structure ParameterSet */
-        stServiceFlowParamSI *psfParameterSet; /* < structure ParameterSet */
+        struct bcm_connect_mgr_params *psfParameterSet; /* < connection manager parameters */
 };
 
 struct bcm_add_indication {
@@ -282,13 +278,9 @@ struct bcm_add_indication {
         B_UINT16 u16CID; /* < 16bitCID */
         /* brief 16bitVCID */
         B_UINT16 u16VCID; /* < 16bitVCID */
-        /* brief structure AuthorizedSet */
-        /* brief structure AuthorizedSet */
-        stServiceFlowParamSI *psfAuthorizedSet; /* < AuthorizedSet of type stServiceFlowParamSI */
-        /* brief structure AdmittedSet */
-        stServiceFlowParamSI *psfAdmittedSet; /* < AdmittedSet of type stServiceFlowParamSI */
-        /* brief structure ActiveSet */
-        stServiceFlowParamSI *psfActiveSet; /* < sfActiveSet of type stServiceFlowParamSI */
+        struct bcm_connect_mgr_params *psfAuthorizedSet; /* Authorized set of connection manager parameters */
+        struct bcm_connect_mgr_params *psfAdmittedSet; /* Admitted set of connection manager parameters */
+        struct bcm_connect_mgr_params *psfActiveSet; /* Activeset of connection manager parameters */
         B_UINT8 u8CC; /* <Confirmation Code */
         B_UINT8 u8Padd; /* < 8-bit Padding */
         B_UINT16 u16Padd; /* < 16 bit Padding */
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 08d13a4dfd70..10361bb35059 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -101,7 +101,7 @@ VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, struct bcm_t
                sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
 }
 
-VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)
+VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex)
 {
         S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;