openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

atomisp: unwrap the _ex malloc/free functions 

We are not using these for debugging or debug logging so remove the defines,
trim and rename the functions.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Cox 2017-04-12 19:21:22 +01:00 committed by Greg Kroah-Hartman
parent b35530650f
commit 83fceac050
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
View File

@ -2015,34 +2015,25 @@ ia_css_enable_isys_event_queue(bool enable)
return IA_CSS_SUCCESS;
}
void *
sh_css_malloc_ex(size_t size, const char *caller_func, int caller_line)
void *sh_css_malloc(size_t size)
{
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "sh_css_malloc() enter: size=%d\n",size);
(void)caller_func;
(void)caller_line;
if (size > 0 && my_css.malloc)
return my_css.malloc(size, false);
return NULL;
}
void *
sh_css_calloc_ex(size_t N, size_t size, const char *caller_func, int caller_line)
void *sh_css_calloc(size_t N, size_t size)
{
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "sh_css_calloc() enter: N=%d, size=%d\n",N,size);
(void)caller_func;
(void)caller_line;
if (size > 0 && my_css.malloc)
return my_css.malloc(N*size, true);
return NULL;
}
void
sh_css_free_ex(void *ptr, const char *caller_func, int caller_line)
void sh_css_free(void *ptr)
{
IA_CSS_ENTER_PRIVATE("ptr = %p", ptr);
(void)caller_func;
(void)caller_line;
if (ptr && my_css.free)
my_css.free(ptr);
IA_CSS_LEAVE_PRIVATE("void");

17
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h
View File

@ -1002,23 +1002,14 @@ sh_css_params_init(void);
void
sh_css_params_uninit(void);
#define sh_css_malloc(size) sh_css_malloc_ex(size, __func__, __LINE__)
#define sh_css_calloc(N, size) sh_css_calloc_ex(N, size, __func__, __LINE__)
#define sh_css_free(ptr) sh_css_free_ex(ptr, __func__, __LINE__)
void *sh_css_malloc(size_t size);
void *sh_css_calloc(size_t N, size_t size);
void *
sh_css_malloc_ex(size_t size, const char *caller_func, int caller_line);
void *
sh_css_calloc_ex(size_t N, size_t size, const char *caller_func, int caller_lin);
void
sh_css_free_ex(void *ptr, const char *caller_func, int caller_line);
void sh_css_free(void *ptr);
/* For Acceleration API: Flush FW (shared buffer pointer) arguments */
void
sh_css_flush(struct ia_css_acc_fw *fw);
void sh_css_flush(struct ia_css_acc_fw *fw);
void