diff options
| author | Alan Cox <alan@linux.intel.com> | 2017-04-12 19:21:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-14 10:06:26 +0200 |
| commit | b35530650fcd9a61dfc57846d777f5cd77cd4abc (patch) | |
| tree | 77cdc571af524e7843416670a623e050342725d5 /drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | |
| parent | 5eb328740de1425f95fc5ff34dac26f3850c3711 (diff) | |
atomisp: remove most of the uses of atomisp_kernel_malloc
They can be replaced by kmalloc. There are a few that do need to pick kmalloc
or vmalloc. Those we leave for the moment.
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/hmm/hmm_reserved_pool.c')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c index 590ff7bc6c5f..4000c05652e1 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c @@ -89,18 +89,18 @@ static int hmm_reserved_pool_setup(struct hmm_reserved_pool_info **repool_info, { struct hmm_reserved_pool_info *pool_info; - pool_info = atomisp_kernel_malloc( - sizeof(struct hmm_reserved_pool_info)); + pool_info = kmalloc(sizeof(struct hmm_reserved_pool_info), + GFP_KERNEL); if (unlikely(!pool_info)) { dev_err(atomisp_dev, "out of memory for repool_info.\n"); return -ENOMEM; } - pool_info->pages = atomisp_kernel_malloc( - sizeof(struct page *) * pool_size); + pool_info->pages = kmalloc(sizeof(struct page *) * pool_size, + GFP_KERNEL); if (unlikely(!pool_info->pages)) { dev_err(atomisp_dev, "out of memory for repool_info->pages.\n"); - atomisp_kernel_free(pool_info); + kfree(pool_info); return -ENOMEM; } @@ -233,8 +233,8 @@ static void hmm_reserved_pool_exit(void **pool) __free_pages(repool_info->pages[i], 0); } - atomisp_kernel_free(repool_info->pages); - atomisp_kernel_free(repool_info); + kfree(repool_info->pages); + kfree(repool_info); *pool = NULL; } |