summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-01-15 13:06:41 +0900
committerTom Rini <trini@ti.com>2014-01-24 16:59:08 -0500
commit347d06dec43e2e6ca50f975d5472072a977c528f (patch)
tree11ebfdaf3d4af2f2abb6f31831060afdb11d246e
parentbf1af3d872831dd33fff223f007bbcf4e546f5b8 (diff)
downloadu-boot-imx-347d06dec43e2e6ca50f975d5472072a977c528f.zip
u-boot-imx-347d06dec43e2e6ca50f975d5472072a977c528f.tar.gz
u-boot-imx-347d06dec43e2e6ca50f975d5472072a977c528f.tar.bz2
sandbox: fix the return type of os_free() function
The function os_free() returns nothing. Its return type should be "void" rather than "void *". Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--arch/sandbox/cpu/os.c2
-rw-r--r--include/os.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index 725b505..2e2fc58 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -143,7 +143,7 @@ void *os_malloc(size_t length)
return hdr + 1;
}
-void *os_free(void *ptr)
+void os_free(void *ptr)
{
struct os_mem_hdr *hdr = ptr;
diff --git a/include/os.h b/include/os.h
index b65fba4..d6d6e57 100644
--- a/include/os.h
+++ b/include/os.h
@@ -113,7 +113,7 @@ void *os_malloc(size_t length);
*
* \param ptr Pointer to memory block to free
*/
-void *os_free(void *ptr);
+void os_free(void *ptr);
/**
* Reallocate previously-allocated memory to increase/decrease space