p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: media: atomisp: kmap() can't fail 

There's no need to check kmap() return value because it won't fail.
If it's highmem mapping, it will receive virtual address
or a new one; if it's lowmem, all kernel pages are already being mapped.

(Thanks to Jan Kara for explanations)

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Fabian Frederick 2017-04-28 13:10:39 +01:00 committed by Greg Kroah-Hartman
parent 5795a9a5fe
commit 5b686ccd2e
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c
View File

@ -333,15 +333,7 @@ static int load_and_flush_by_kmap(ia_css_ptr virt, void *data, unsigned int byte
idx = (virt - bo->start) >> PAGE_SHIFT; idx = (virt - bo->start) >> PAGE_SHIFT;
offset = (virt - bo->start) - (idx << PAGE_SHIFT); offset = (virt - bo->start) - (idx << PAGE_SHIFT);
src = (char *)kmap(bo->page_obj[idx].page); src = (char *)kmap(bo->page_obj[idx].page) + offset;
if (!src) {
dev_err(atomisp_dev,
"kmap buffer object page failed: "
"pg_idx = %d\n", idx);
return -EINVAL;
}
src += offset;
if ((bytes + offset) >= PAGE_SIZE) { if ((bytes + offset) >= PAGE_SIZE) {
len = PAGE_SIZE - offset; len = PAGE_SIZE - offset;
@ -538,14 +530,7 @@ int hmm_set(ia_css_ptr virt, int c, unsigned int bytes)
idx = (virt - bo->start) >> PAGE_SHIFT; idx = (virt - bo->start) >> PAGE_SHIFT;
offset = (virt - bo->start) - (idx << PAGE_SHIFT); offset = (virt - bo->start) - (idx << PAGE_SHIFT);
des = (char *)kmap(bo->page_obj[idx].page); des = (char *)kmap(bo->page_obj[idx].page) + offset;
if (!des) {
dev_err(atomisp_dev,
"kmap buffer object page failed: "
"pg_idx = %d\n", idx);
return -EINVAL;
}
des += offset;
if ((bytes + offset) >= PAGE_SIZE) { if ((bytes + offset) >= PAGE_SIZE) {
len = PAGE_SIZE - offset; len = PAGE_SIZE - offset;