I moved the declarations UINT uiSearchRuleIndex = 0; and ULONG ulSFID; from out of a switch/case statement. And also, removed useless duplicate UINT uiSearchRuleIndex = 0; and a variant UINT uiSearchRuleIndex;. Signed-off-by: Gary Alan Rookard <garyrookard@xxxxxxxxx> --- On branch staging-next drivers/staging/bcm/CmHost.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index cc91b5e..2d1f94d 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -1637,7 +1637,8 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to struct bcm_add_indication_alt *pstAddIndication = NULL; struct bcm_change_indication *pstChangeIndication = NULL; struct bcm_leader *pLeader = NULL; - + UINT uiSearchRuleIndex = 0; + ULONG ulSFID; /* * Otherwise the message contains a target address from where we need to * read out the rest of the service flow param structure @@ -1685,7 +1686,6 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to } /* no break here..we should go down. */ case DSA_ACK: { - UINT uiSearchRuleIndex = 0; BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "VCID:0x%X", ntohs(pstAddIndication->u16VCID)); @@ -1794,7 +1794,6 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to } case DSC_ACK: { - UINT uiSearchRuleIndex = 0; pstChangeIndication = (struct bcm_change_indication *)pstAddIndication; uiSearchRuleIndex = SearchSfid(Adapter, ntohl(pstChangeIndication->sfActiveSet.u32SFID)); @@ -1853,8 +1852,6 @@ bool CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to break; case DSD_REQ: { - UINT uiSearchRuleIndex; - ULONG ulSFID; pLeader->PLength = sizeof(struct bcm_del_indication); *((struct bcm_del_indication *)&(Adapter->caDsxReqResp[LEADER_SIZE])) = *((struct bcm_del_indication *)pstAddIndication); -- 1.9.0 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel