Skip to content

Commit

Permalink
Staging: w35und: remove memcpy/memcmp wrappers
Browse files Browse the repository at this point in the history
The OS_MEMORY_CLEAR macro is not used so remove it. Also convert the one
call-site that uses OS_MEMORY_COMPARE to use memcmp() directly and remove the
wrapper macro.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent 44e8541 commit fc68c7e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
3 changes: 0 additions & 3 deletions drivers/staging/winbond/linux/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,5 @@
#define OS_EVENT_INDICATE( _A, _B, _F )
#define OS_PMKID_STATUS_EVENT( _A )

#define OS_MEMORY_CLEAR( _A, _S ) memset( (u8 *)_A,0,_S)
#define OS_MEMORY_COMPARE( _A, _B, _S ) (memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different

#endif // COMMON_DEF

9 changes: 4 additions & 5 deletions drivers/staging/winbond/wblinux.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,11 @@ WbWLanInitialize(struct wb35_adapter *adapter)
pMacAddr = adapter->sLocalPara.ThisMacAddress;
pMacAddr2 = adapter->sLocalPara.PermanentAddress;
hal_get_permanent_address( pHwData, adapter->sLocalPara.PermanentAddress );// Reading ethernet address from EEPROM
if (OS_MEMORY_COMPARE(pMacAddr, "\x00\x00\x00\x00\x00\x00", MAC_ADDR_LENGTH )) // Is equal
{
memcpy( pMacAddr, pMacAddr2, MAC_ADDR_LENGTH );
} else {
if (memcmp(pMacAddr, "\x00\x00\x00\x00\x00\x00", MAC_ADDR_LENGTH) == 0)
memcpy(pMacAddr, pMacAddr2, MAC_ADDR_LENGTH);
else {
// Set the user define MAC address
hal_set_ethernet_address( pHwData, adapter->sLocalPara.ThisMacAddress );
hal_set_ethernet_address(pHwData, adapter->sLocalPara.ThisMacAddress);
}

//get current antenna
Expand Down

0 comments on commit fc68c7e

Please sign in to comment.