From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 745A1C432C3 for ; Fri, 15 Nov 2019 18:01:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5944F20674 for ; Fri, 15 Nov 2019 18:01:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726974AbfKOSBB (ORCPT ); Fri, 15 Nov 2019 13:01:01 -0500 Received: from mga18.intel.com ([134.134.136.126]:28695 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726075AbfKOSA7 (ORCPT ); Fri, 15 Nov 2019 13:00:59 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Nov 2019 10:00:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,309,1569308400"; d="scan'208";a="257824270" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 15 Nov 2019 10:00:56 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id CE859418; Fri, 15 Nov 2019 20:00:55 +0200 (EET) From: Andy Shevchenko To: linux-kernel@vger.kernel.org, Christoph Hellwig Cc: Andy Shevchenko , Dan Williams , Alex Williamson , Cornelia Huck Subject: [PATCH v1 5/5] vfio/pci: Drop duplicate check for size parameter of memremap() Date: Fri, 15 Nov 2019 20:00:44 +0200 Message-Id: <20191115180044.83659-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191115180044.83659-1-andriy.shevchenko@linux.intel.com> References: <20191115180044.83659-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since memremap() returns NULL pointer for size = 0, there is no need to duplicate this check in the callers. Cc: Christoph Hellwig Cc: Dan Williams Cc: Alex Williamson Cc: Cornelia Huck Signed-off-by: Andy Shevchenko --- drivers/vfio/pci/vfio_pci_igd.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_igd.c b/drivers/vfio/pci/vfio_pci_igd.c index 53d97f459252..3088a33af271 100644 --- a/drivers/vfio/pci/vfio_pci_igd.c +++ b/drivers/vfio/pci/vfio_pci_igd.c @@ -75,13 +75,7 @@ static int vfio_pci_igd_opregion_init(struct vfio_pci_device *vdev) return -EINVAL; } - size = le32_to_cpu(*(__le32 *)(base + 16)); - if (!size) { - memunmap(base); - return -EINVAL; - } - - size *= 1024; /* In KB */ + size = le32_to_cpu(*(__le32 *)(base + 16)) * 1024; /* In KB */ if (size != OPREGION_SIZE) { memunmap(base); -- 2.24.0