Use the normal types.
Remove the now unused typedef.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/bcm/CmHost.c | 4 ++--
drivers/staging/bcm/Typedefs.h | 1 -
drivers/staging/bcm/nvm.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 96fa166..4ad81a8 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -2266,7 +2266,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
Hence any access to the newly added SF through uiSearchRuleIndex is invalid.
SHOULD BE STRICTLY AVOIDED.
*/
-// *(PULONG)(((unsigned char *)pvBuffer)+1)=psfLocalSet->u32SFID;
+// *(unsigned long *)(((unsigned char *)pvBuffer)+1)=psfLocalSet->u32SFID;
memcpy((((unsigned char *)pvBuffer)+1), &psfLocalSet->u32SFID, 4);
if (pstAddIndication->sfActiveSet.bValid == TRUE) {
@@ -2368,7 +2368,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap
CopyToAdapter(Adapter, psfLocalSet, uiSearchRuleIndex,
DSC_ACK, pstAddIndication);
- *(PULONG)(((unsigned char *)pvBuffer)+1)=psfLocalSet->u32SFID;
+ *(unsigned long *)(((unsigned char *)pvBuffer)+1)=psfLocalSet->u32SFID;
} else if (pstChangeIndication->u8CC == 6) {
deleteSFBySfid(Adapter, uiSearchRuleIndex);
kfree(pstAddIndication);
diff --git a/drivers/staging/bcm/Typedefs.h b/drivers/staging/bcm/Typedefs.h
index 6e8da32..bd7dafc 100644
--- a/drivers/staging/bcm/Typedefs.h
+++ b/drivers/staging/bcm/Typedefs.h
@@ -16,7 +16,6 @@ typedef unsigned short B_UINT16;
typedef unsigned int B_UINT32;
typedef unsigned long DWORD;
-typedef unsigned long* PULONG;
typedef unsigned long long ULONG64;
typedef unsigned long long LARGE_INTEGER;
typedef unsigned int UINT32;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 58691be..9cd3a1cd 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -1478,7 +1478,7 @@ int PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
Status = -1;
break;
}
- wrm(Adapter, uiMemoryLoc, (char *)(((PULONG)pBuff)+uiIndex), uiBytesToCopy);
+ wrm(Adapter, uiMemoryLoc, (char *)(((unsigned long *)pBuff)+uiIndex), uiBytesToCopy);
uiMemoryLoc += uiBytesToCopy;
uiEepromSize -= uiBytesToCopy;
uiCalStartAddr += uiBytesToCopy;
--
1.7.8.111.gad25c.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
