Skip to content

Commit b355306

Browse files
Alan Coxgregkh
Alan Cox
authored and
gregkh
committed
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5eb3287 commit b355306

File tree

4 files changed

+28
-32
lines changed

4 files changed

+28
-32
lines changed

‎drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,11 +1669,7 @@ int atomisp_alloc_dis_coef_buf(struct atomisp_sub_device *asd)
16691669

16701670
int atomisp_alloc_metadata_output_buf(struct atomisp_sub_device *asd)
16711671
{
1672-
#ifndef ISP2401
1673-
int i; /* Coverity CID 298003 - index var must be signed */
1674-
#else
16751672
int i;
1676-
#endif
16771673

16781674
/* We allocate the cpu-side buffer used for communication with user
16791675
* space */

‎drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -724,8 +724,8 @@ static int alloc_private_pages(struct hmm_buffer_object *bo,
724724

725725
pgnr = bo->pgnr;
726726

727-
bo->page_obj = atomisp_kernel_malloc(
728-
sizeof(struct hmm_page_object) * pgnr);
727+
bo->page_obj = kmalloc(sizeof(struct hmm_page_object) * pgnr,
728+
GFP_KERNEL);
729729
if (unlikely(!bo->page_obj)) {
730730
dev_err(atomisp_dev, "out of memory for bo->page_obj\n");
731731
return -ENOMEM;
@@ -859,7 +859,7 @@ static int alloc_private_pages(struct hmm_buffer_object *bo,
859859
alloc_pgnr = i;
860860
free_private_bo_pages(bo, dypool, repool, alloc_pgnr);
861861

862-
atomisp_kernel_free(bo->page_obj);
862+
kfree(bo->page_obj);
863863

864864
return -ENOMEM;
865865
}
@@ -870,7 +870,7 @@ static void free_private_pages(struct hmm_buffer_object *bo,
870870
{
871871
free_private_bo_pages(bo, dypool, repool, bo->pgnr);
872872

873-
atomisp_kernel_free(bo->page_obj);
873+
kfree(bo->page_obj);
874874
}
875875

876876
/*
@@ -989,17 +989,17 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
989989
struct vm_area_struct *vma;
990990
struct page **pages;
991991

992-
pages = atomisp_kernel_malloc(sizeof(struct page *) * bo->pgnr);
992+
pages = kmalloc(sizeof(struct page *) * bo->pgnr, GFP_KERNEL);
993993
if (unlikely(!pages)) {
994994
dev_err(atomisp_dev, "out of memory for pages...\n");
995995
return -ENOMEM;
996996
}
997997

998-
bo->page_obj = atomisp_kernel_malloc(
999-
sizeof(struct hmm_page_object) * bo->pgnr);
998+
bo->page_obj = kmalloc(sizeof(struct hmm_page_object) * bo->pgnr,
999+
GFP_KERNEL);
10001000
if (unlikely(!bo->page_obj)) {
10011001
dev_err(atomisp_dev, "out of memory for bo->page_obj...\n");
1002-
atomisp_kernel_free(pages);
1002+
kfree(pages);
10031003
return -ENOMEM;
10041004
}
10051005

@@ -1009,8 +1009,8 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
10091009
up_read(&current->mm->mmap_sem);
10101010
if (vma == NULL) {
10111011
dev_err(atomisp_dev, "find_vma failed\n");
1012-
atomisp_kernel_free(bo->page_obj);
1013-
atomisp_kernel_free(pages);
1012+
kfree(bo->page_obj);
1013+
kfree(pages);
10141014
mutex_lock(&bo->mutex);
10151015
return -EFAULT;
10161016
}
@@ -1050,15 +1050,15 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
10501050
bo->page_obj[i].type = HMM_PAGE_TYPE_GENERAL;
10511051
}
10521052
hmm_mem_stat.usr_size += bo->pgnr;
1053-
atomisp_kernel_free(pages);
1053+
kfree(pages);
10541054

10551055
return 0;
10561056

10571057
out_of_mem:
10581058
for (i = 0; i < page_nr; i++)
10591059
put_page(pages[i]);
1060-
atomisp_kernel_free(pages);
1061-
atomisp_kernel_free(bo->page_obj);
1060+
kfree(pages);
1061+
kfree(bo->page_obj);
10621062

10631063
return -ENOMEM;
10641064
}
@@ -1071,7 +1071,7 @@ static void free_user_pages(struct hmm_buffer_object *bo)
10711071
put_page(bo->page_obj[i].page);
10721072
hmm_mem_stat.usr_size -= bo->pgnr;
10731073

1074-
atomisp_kernel_free(bo->page_obj);
1074+
kfree(bo->page_obj);
10751075
}
10761076

10771077
/*
@@ -1362,7 +1362,7 @@ void *hmm_bo_vmap(struct hmm_buffer_object *bo, bool cached)
13621362
bo->status &= ~(HMM_BO_VMAPED | HMM_BO_VMAPED_CACHED);
13631363
}
13641364

1365-
pages = atomisp_kernel_malloc(sizeof(*pages) * bo->pgnr);
1365+
pages = kmalloc(sizeof(*pages) * bo->pgnr, GFP_KERNEL);
13661366
if (unlikely(!pages)) {
13671367
mutex_unlock(&bo->mutex);
13681368
dev_err(atomisp_dev, "out of memory for pages...\n");
@@ -1375,14 +1375,14 @@ void *hmm_bo_vmap(struct hmm_buffer_object *bo, bool cached)
13751375
bo->vmap_addr = vmap(pages, bo->pgnr, VM_MAP,
13761376
cached ? PAGE_KERNEL : PAGE_KERNEL_NOCACHE);
13771377
if (unlikely(!bo->vmap_addr)) {
1378-
atomisp_kernel_free(pages);
1378+
kfree(pages);
13791379
mutex_unlock(&bo->mutex);
13801380
dev_err(atomisp_dev, "vmap failed...\n");
13811381
return NULL;
13821382
}
13831383
bo->status |= (cached ? HMM_BO_VMAPED_CACHED : HMM_BO_VMAPED);
13841384

1385-
atomisp_kernel_free(pages);
1385+
kfree(pages);
13861386

13871387
mutex_unlock(&bo->mutex);
13881388
return bo->vmap_addr;

‎drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ static int hmm_dynamic_pool_init(void **pool, unsigned int pool_size)
149149
if (pool_size == 0)
150150
return 0;
151151

152-
dypool_info = atomisp_kernel_malloc(
153-
sizeof(struct hmm_dynamic_pool_info));
152+
dypool_info = kmalloc(sizeof(struct hmm_dynamic_pool_info),
153+
GFP_KERNEL);
154154
if (unlikely(!dypool_info)) {
155155
dev_err(atomisp_dev, "out of memory for repool_info.\n");
156156
return -ENOMEM;
@@ -160,7 +160,7 @@ static int hmm_dynamic_pool_init(void **pool, unsigned int pool_size)
160160
sizeof(struct hmm_page), 0,
161161
SLAB_HWCACHE_ALIGN, NULL);
162162
if (!dypool_info->pgptr_cache) {
163-
atomisp_kernel_free(dypool_info);
163+
kfree(dypool_info);
164164
return -ENOMEM;
165165
}
166166

@@ -217,7 +217,7 @@ static void hmm_dynamic_pool_exit(void **pool)
217217

218218
kmem_cache_destroy(dypool_info->pgptr_cache);
219219

220-
atomisp_kernel_free(dypool_info);
220+
kfree(dypool_info);
221221

222222
*pool = NULL;
223223
}

‎drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,18 @@ static int hmm_reserved_pool_setup(struct hmm_reserved_pool_info **repool_info,
8989
{
9090
struct hmm_reserved_pool_info *pool_info;
9191

92-
pool_info = atomisp_kernel_malloc(
93-
sizeof(struct hmm_reserved_pool_info));
92+
pool_info = kmalloc(sizeof(struct hmm_reserved_pool_info),
93+
GFP_KERNEL);
9494
if (unlikely(!pool_info)) {
9595
dev_err(atomisp_dev, "out of memory for repool_info.\n");
9696
return -ENOMEM;
9797
}
9898

99-
pool_info->pages = atomisp_kernel_malloc(
100-
sizeof(struct page *) * pool_size);
99+
pool_info->pages = kmalloc(sizeof(struct page *) * pool_size,
100+
GFP_KERNEL);
101101
if (unlikely(!pool_info->pages)) {
102102
dev_err(atomisp_dev, "out of memory for repool_info->pages.\n");
103-
atomisp_kernel_free(pool_info);
103+
kfree(pool_info);
104104
return -ENOMEM;
105105
}
106106

@@ -233,8 +233,8 @@ static void hmm_reserved_pool_exit(void **pool)
233233
__free_pages(repool_info->pages[i], 0);
234234
}
235235

236-
atomisp_kernel_free(repool_info->pages);
237-
atomisp_kernel_free(repool_info);
236+
kfree(repool_info->pages);
237+
kfree(repool_info);
238238

239239
*pool = NULL;
240240
}

0 commit comments

Comments
 (0)