Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc68c7ef authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

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: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44e8541c

drivers/staging/winbond/linux/common.h

+0 −3
Original line number Diff line number Diff line
@@ -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

drivers/staging/winbond/wblinux.c

+4 −5
Original line number Diff line number Diff line
@@ -181,10 +181,9 @@ 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

	{

	if (memcmp(pMacAddr, "\x00\x00\x00\x00\x00\x00", MAC_ADDR_LENGTH) == 0)

		memcpy(pMacAddr, pMacAddr2, MAC_ADDR_LENGTH);

	} else {

	else {

		// Set the user define MAC address

		hal_set_ethernet_address(pHwData, adapter->sLocalPara.ThisMacAddress);

	}