From f78d5f809ee248bea66fad9fa14fe62b8aec57af Mon Sep 17 00:00:00 2001 From: Chaehyun Lim Date: Mon, 10 Aug 2015 11:33:20 +0900 Subject: [PATCH] staging: wilc1000: remove WILC_memcpy function Remove WILC_memcpy function that is changed to memcpy. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/wilc_strutils.h | 30 ------------------------ 1 file changed, 30 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_strutils.h b/drivers/staging/wilc1000/wilc_strutils.h index 03f4938a81e1..dbca73d86439 100644 --- a/drivers/staging/wilc1000/wilc_strutils.h +++ b/drivers/staging/wilc1000/wilc_strutils.h @@ -27,36 +27,6 @@ */ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, u32 u32Count); -/*! - * @brief Copies the contents of a memory buffer into another - * @param[in] pvTarget the target buffer to which the data is copied into - * @param[in] pvSource pointer to the second memory location - * @param[in] u32Count the size of the data to copy - * @return WILC_SUCCESS if copy is successfully handeled - * WILC_FAIL if copy failed - * @note this function repeats the functionality of standard memcpy, - * however memcpy is undefined if the two buffers overlap but this - * implementation will check for overlap and report error - * @author syounan - * @date 18 Aug 2010 - * @version 1.0 - */ -static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, u32 u32Count) -{ - if ( - (((u8 *)pvTarget <= (u8 *)pvSource) - && (((u8 *)pvTarget + u32Count) > (u8 *)pvSource)) - - || (((u8 *)pvSource <= (u8 *)pvTarget) - && (((u8 *)pvSource + u32Count) > (u8 *)pvTarget)) - ) { - /* ovelapped memory, return Error */ - return WILC_FAIL; - } else { - WILC_memcpy_INTERNAL(pvTarget, pvSource, u32Count); - return WILC_SUCCESS; - } -} -- 2.20.1