diff options
author | Alan Cox <alan@linux.intel.com> | 2017-04-12 19:21:22 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-14 10:06:26 +0200 |
commit | 83fceac0504fbcbe2aad420f7791ed740cc20612 (patch) | |
tree | fb20cc1be0e966b7e474d69eaac15ea41c7f263e /drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h | |
parent | b35530650fcd9a61dfc57846d777f5cd77cd4abc (diff) | |
download | op-kernel-dev-83fceac0504fbcbe2aad420f7791ed740cc20612.zip op-kernel-dev-83fceac0504fbcbe2aad420f7791ed740cc20612.tar.gz |
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>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h index a108923..e2b6f06 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h @@ -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 |