diff options
| author | Pekka Enberg | 2008-10-29 19:10:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-01-06 22:51:45 +0100 |
| commit | fc68c7efea279b066bd5f7cc7413099a6b22bbec (patch) | |
| tree | 1522a4c9a9543bb2604c536bab39b69e6df1fdb1 /drivers/staging/winbond/wblinux.c | |
| parent | Staging: w35und: remove atomic op wrappers (diff) | |
| download | kernel-qcow2-linux-fc68c7efea279b066bd5f7cc7413099a6b22bbec.tar.gz kernel-qcow2-linux-fc68c7efea279b066bd5f7cc7413099a6b22bbec.tar.xz kernel-qcow2-linux-fc68c7efea279b066bd5f7cc7413099a6b22bbec.zip | |
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>
Diffstat (limited to 'drivers/staging/winbond/wblinux.c')
| -rw-r--r-- | drivers/staging/winbond/wblinux.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c index 87b9970883d8..a662dde8e411 100644 --- a/drivers/staging/winbond/wblinux.c +++ b/drivers/staging/winbond/wblinux.c @@ -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 |