Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1432683AbdDYSKr (ORCPT ); Tue, 25 Apr 2017 14:10:47 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:26415 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1430971AbdDYSKZ (ORCPT ); Tue, 25 Apr 2017 14:10:25 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3A975AsRds4fR3yOClSmfAwtU4lGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxc6yZx7h7PlgxGXEQZ/co6odzbGJ4+a9ASQp2tWojjMrSNR0TRgLiM?= =?us-ascii?q?EbzUQLIfWuLgnFFsPsdDEwB89YVVVorDmROElRH9viNRWJ+iXhpRZbIBj0NBJ0?= =?us-ascii?q?K+LpAcaSyp3vj6Hhs6HUNiBBmSC6KZh7Ngu/qQXW/uIWjItrIO5lzxDJr3tBcc?= =?us-ascii?q?xVyHluKFbVmAzzsIP404Ru/GxzofUo94tgWL/meq0+BehXFjkpMGAd4MztqAnN?= =?us-ascii?q?ShaJ6nIAU2IQ1B1SDF6BpDj+V5G5mSzq/r503CCcFcn3S60kHzWk86pvDhTvjX?= =?us-ascii?q?FUGSQ+9TT5g8ZxhaQTjgisqxFlwoXXKNWbPfBwVrjebNUXWSxLU5ACBGR6Hoqg?= =?us-ascii?q?Yt5XXKI6NuFCoty4/gNWoA=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DGAQCckP9Y/zfGs1tbHAELAQUBgmprJ?= =?us-ascii?q?4FGjm+RJQGVOoIPIYYDhBZAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvI4EaJAE?= =?us-ascii?q?Sig8RrDE6hBCHQoZTgV2LC4JKBYkzB4gji2SSeQ2RV5QZHziBBkMdGIRdAUwDH?= =?us-ascii?q?IFlPjWHZ4FPAQEB?= X-IPAS-Result: =?us-ascii?q?A2DGAQCckP9Y/zfGs1tbHAELAQUBgmprJ4FGjm+RJQGVOoI?= =?us-ascii?q?PIYYDhBZAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvI4EaJAESig8RrDE6hBCHQ?= =?us-ascii?q?oZTgV2LC4JKBYkzB4gji2SSeQ2RV5QZHziBBkMdGIRdAUwDHIFlPjWHZ4FPAQE?= =?us-ascii?q?B?= From: Fabian Frederick To: Mauro Carvalho Chehab , Greg Kroah-Hartman , Alan Cox Cc: linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 1/1 linux-next] staging: media: atomisp: kmap() can't fail Date: Tue, 25 Apr 2017 20:10:19 +0200 Message-Id: <20170425181019.1655-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: 1537 Lines: 46 Remove NULL test on kmap() Signed-off-by: Fabian Frederick --- 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