Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp371684pxt; Wed, 4 Aug 2021 13:28:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJosiOml/0iHnPamquTPj3yNTwGt3JXHFwwOvWz1oEfmgC84FlX+U+vv4pot7AIxp4MGw9 X-Received: by 2002:a17:907:16a1:: with SMTP id hc33mr939573ejc.536.1628108905774; Wed, 04 Aug 2021 13:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628108905; cv=none; d=google.com; s=arc-20160816; b=U/qJpqCk82TPTGIyC1LvMToue8w+D64A0JlTp5PDAsVi+ZqzXtrxJGnFtEA5tM+SMs EzOweb+ueAGlxsz9eOoK7y9V0l0bLohqya31l9cl7IJ4grsrugcOGI23P7ADC6COCc3T kRq8pt/XjWqR8VMs1crEeEWd8x5+WINCQdjyBfvDVIBrRCMGRJtp6oo+Vkpej2M1fdwx o7Yc+tjcm9PMGkV/5VHiSdN3HT0ViyDV0+TB+6psu431IOCX8ND5CiZ6zwqKwR9GMRub M6Ma85PtOZk+4eSQVkkdiaDXhwyuhw8F9ijy7FrxPG8NKcUxsaQFj46SHVVh9DFtAGVP NYGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=JAQcAHNibAR4dPKATk+SJLZjC/a58XWoV3fkShRtH7U=; b=ZPWEgeIlpcwse4YDX9iTnQFX2iYclxNxFQQpTodCFYqT/FInhY+rN1wVCGqPUggLGa X8cTTfgoP1QxGV4ZBVLeWxFG7VubNlQnjKlTmSYf7EYifPlvXo7WVX5aAouFFDcF0w26 iZKrXFFK3vOOBn8Fam5T2ieHLg1q04tVObwtzeEK2autwOUw7LVsUwgfvBd2BmHPOufm 9bfwY+XbNI+G6riw1rM4go1Gs51LZzb7TMZKLOqNWCSGM+/UkoOvcYBoATpjSx1b4DFj EqoG+LAQGOC6XkHkyWUdE/TU6Z5p8oxOC2duExrhdEFNQzkn8OTTkSrnHzS78ArTA9fi B7Yg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s1si3080111ejv.457.2021.08.04.13.27.05; Wed, 04 Aug 2021 13:28:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239922AbhHDRQ7 (ORCPT + 99 others); Wed, 4 Aug 2021 13:16:59 -0400 Received: from foss.arm.com ([217.140.110.172]:35062 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239860AbhHDRQs (ORCPT ); Wed, 4 Aug 2021 13:16:48 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 096BA12FC; Wed, 4 Aug 2021 10:16:36 -0700 (PDT) Received: from 010265703453.arm.com (unknown [10.57.36.146]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 470CA3F66F; Wed, 4 Aug 2021 10:16:34 -0700 (PDT) From: Robin Murphy To: joro@8bytes.org, will@kernel.org Cc: iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, suravee.suthikulpanit@amd.com, baolu.lu@linux.intel.com, john.garry@huawei.com, dianders@chromium.org, rajatja@google.com, chenxiang66@hisilicon.com Subject: [PATCH v3 13/25] iommu/dma: Remove redundant "!dev" checks Date: Wed, 4 Aug 2021 18:15:41 +0100 Message-Id: <55ee4aacd23cca8f1dee99c491447ce28095e3d1.1628094601.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org iommu_dma_init_domain() is now only called from iommu_setup_dma_ops(), which has already assumed dev to be non-NULL. Reviewed-by: John Garry Reviewed-by: Lu Baolu Signed-off-by: Robin Murphy --- drivers/iommu/dma-iommu.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 10067fbc4309..e28396cea6eb 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -363,7 +363,7 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, init_iova_domain(iovad, 1UL << order, base_pfn); - if (!cookie->fq_domain && (!dev || !dev_is_untrusted(dev)) && + if (!cookie->fq_domain && !dev_is_untrusted(dev) && domain->ops->flush_iotlb_all && !iommu_get_dma_strict(domain)) { if (init_iova_flush_queue(iovad, iommu_dma_flush_iotlb_all, iommu_dma_entry_dtor)) @@ -372,9 +372,6 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, cookie->fq_domain = domain; } - if (!dev) - return 0; - return iova_reserve_iommu_regions(dev, domain); } -- 2.25.1