redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Staging: w35und: remove memcpy/memcmp wrappers 

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>
hifive-unleashed-5.1
Pekka Enberg 2008-10-29 20:10:55 +02:00 committed by Greg Kroah-Hartman
parent 44e8541c5e
commit fc68c7efea
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/winbond/linux/common.h
View File

@ -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
drivers/staging/winbond/wblinux.c
View File

@ -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