Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965273AbdDZSo5 (ORCPT ); Wed, 26 Apr 2017 14:44:57 -0400 Received: from mailrelay109.isp.belgacom.be ([195.238.20.136]:62896 "EHLO mailrelay109.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965255AbdDZSov (ORCPT ); Wed, 26 Apr 2017 14:44:51 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3Ayo/3mxEuZ7RFRW4b8YitS51GYnF86YWxBRYc798d?= =?us-ascii?q?s5kLTJ75r8+wAkXT6L1XgUPTWs2DsrQf1LqQ7viocFdDyKjCmUhKSIZLWR4BhJ?= =?us-ascii?q?detC0bK+nBN3fGKuX3ZTcxBsVIWQwt1Xi6NU9IBJS2PAWK8TWapAQfERTnNAdz?= =?us-ascii?q?Ov+9WsuL15z2hKiO/Mj2ahhSg3KWaKlsJRG2qk36tsQWiIEqfqM6yhbJq3FgeO?= =?us-ascii?q?lMw25sY1WJkEC4ruiq8ZEr0D5XsvJk18daTaDzeexsQqZVAzcmG2Q04tD7ux7e?= =?us-ascii?q?SweG+nobVCMRiBUeR0Ds6Bj8Frz2omOuv+503gGePMvrXfY1Xyiv6+FgTxq+2w?= =?us-ascii?q?kdMDts3mjdi8V2xIxBrR6svR10wMaAboifOtJlfbLbcM9cT2cXDZUZbDBIHo7p?= =?us-ascii?q?N9hHNOEGJ+sN6tCl/1Y=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DeAgCL6QBZ/zfGs1tcHAELAQUBgmpsJ?= =?us-ascii?q?4FGjnGRAQGVQIIPIYYDhCtAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvI4EaJAE?= =?us-ascii?q?Sig4RrF46hBGHRoZUjHKCSgWJNQeIJ4trkn4NkV6UJx84gQdEHhiEYQFMAxyBZ?= =?us-ascii?q?T41hyaBTwEBAQ?= X-IPAS-Result: =?us-ascii?q?A2DeAgCL6QBZ/zfGs1tcHAELAQUBgmpsJ4FGjnGRAQGVQII?= =?us-ascii?q?PIYYDhCtAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvI4EaJAESig4RrF46hBGHR?= =?us-ascii?q?oZUjHKCSgWJNQeIJ4trkn4NkV6UJx84gQdEHhiEYQFMAxyBZT41hyaBTwEBAQ?= From: Fabian Frederick To: Mauro Carvalho Chehab , Greg Kroah-Hartman , Alan Cox Cc: Jan Kara , linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH V2 linux-next] staging: media: atomisp: kmap() can't fail Date: Wed, 26 Apr 2017 20:44:23 +0200 Message-Id: <20170426184423.21301-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1806 Lines: 52 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 --- V2: Verbose description (suggested by Greg Kroah-Hartman) drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c index 151abf0..7d2f8d9 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c @@ -328,15 +328,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; @@ -533,14 +525,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; -- 2.9.3