staging: media: atomisp: kmap() can't fail
authorFabian Frederick <fabf@skynet.be>
Fri, 28 Apr 2017 12:10:39 +0000 (13:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Apr 2017 12:27:26 +0000 (14:27 +0200)
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>
drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c

index 358872393646ecca357af393ae7b5038acb2e264..57295397da3e5fca1f10510c16fdf84e0481d3ea 100644 (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;
                offset = (virt - bo->start) - (idx << PAGE_SHIFT);
 
-               src = (char *)kmap(bo->page_obj[idx].page);
-               if (!src) {
-                       dev_err(atomisp_dev,
-                                   "kmap buffer object page failed: "
-                                   "pg_idx = %d\n", idx);
-                       return -EINVAL;
-               }
-
-               src += offset;
+               src = (char *)kmap(bo->page_obj[idx].page) + offset;
 
                if ((bytes + offset) >= PAGE_SIZE) {
                        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;
                offset = (virt - bo->start) - (idx << PAGE_SHIFT);
 
-               des = (char *)kmap(bo->page_obj[idx].page);
-               if (!des) {
-                       dev_err(atomisp_dev,
-                                   "kmap buffer object page failed: "
-                                   "pg_idx = %d\n", idx);
-                       return -EINVAL;
-               }
-               des += offset;
+               des = (char *)kmap(bo->page_obj[idx].page) + offset;
 
                if ((bytes + offset) >= PAGE_SIZE) {
                        len = PAGE_SIZE - offset;