From nobody Tue Sep 16 10:48:40 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07932C4708E for ; Wed, 4 Jan 2023 13:06:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239262AbjADNGR (ORCPT ); Wed, 4 Jan 2023 08:06:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239285AbjADNFk (ORCPT ); Wed, 4 Jan 2023 08:05:40 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCD741DF3A for ; Wed, 4 Jan 2023 05:05:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672837535; x=1704373535; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TB3vMqIiPfgVVIrkJxZ1YwxXb13IM9MbEZds9ge+394=; b=P/A4IqabUHLnKNLN3gan3nWtzaJxEw44Vi78TfsOBOuEEn1A32GYUerf clxe+Hx6xKjFwANeBSWTx157hRqww5AAj6u7XBhV6p8yh4xbuSnRJtP91 g3Ih5LehutqQgCi9XJQ8Eq2hzMPQjGvbCkFQNAmku5FMzCY9GqG/ZkYXY IBIDOcm+uI1n9BeUueIUYuO0ZDrTqgkZ9R7a/SqAq7Mb/C94A3sQeTbBw wx5bdR5YkAeZfNVTDUKe31dCV3NmEz8isYWni6Do3ok9UIc3K6yzxSofD OvKduhaFBK0gmepi90OQDOVbcclq/+sjftiphDHYs7TB3tER+aA6gP1Wp w==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="320639627" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="320639627" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 05:05:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="797529027" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="797529027" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga001.fm.intel.com with ESMTP; 04 Jan 2023 05:05:28 -0800 From: Lu Baolu To: Joerg Roedel , Jason Gunthorpe , Christoph Hellwig , Kevin Tian , Will Deacon , Robin Murphy , Jean-Philippe Brucker Cc: Suravee Suthikulpanit , Hector Martin , Sven Peter , Rob Clark , Marek Szyprowski , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Yong Wu , Matthias Brugger , Heiko Stuebner , Matthew Rosato , Orson Zhai , Baolin Wang , Chunyan Zhang , Chen-Yu Tsai , Thierry Reding , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v4 02/19] iommu/apple-dart: Remove detach_dev callback Date: Wed, 4 Jan 2023 20:57:08 +0800 Message-Id: <20230104125725.271850-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104125725.271850-1-baolu.lu@linux.intel.com> References: <20230104125725.271850-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The IOMMU driver supports default domain, so the detach_dev op will never be called. Remove it to avoid dead code. Reviewed-by: Jason Gunthorpe Reviewed-by: Sven Peter Signed-off-by: Lu Baolu --- drivers/iommu/apple-dart.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index 4f4a323be0d0..96843d468801 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -486,13 +486,6 @@ static int apple_dart_domain_add_streams(struct apple_= dart_domain *domain, true); } =20 -static int apple_dart_domain_remove_streams(struct apple_dart_domain *doma= in, - struct apple_dart_master_cfg *cfg) -{ - return apple_dart_mod_streams(domain->stream_maps, cfg->stream_maps, - false); -} - static int apple_dart_attach_dev(struct iommu_domain *domain, struct device *dev) { @@ -535,22 +528,6 @@ static int apple_dart_attach_dev(struct iommu_domain *= domain, return ret; } =20 -static void apple_dart_detach_dev(struct iommu_domain *domain, - struct device *dev) -{ - int i; - struct apple_dart_stream_map *stream_map; - struct apple_dart_master_cfg *cfg =3D dev_iommu_priv_get(dev); - struct apple_dart_domain *dart_domain =3D to_dart_domain(domain); - - for_each_stream_map(i, cfg, stream_map) - apple_dart_hw_disable_dma(stream_map); - - if (domain->type =3D=3D IOMMU_DOMAIN_DMA || - domain->type =3D=3D IOMMU_DOMAIN_UNMANAGED) - apple_dart_domain_remove_streams(dart_domain, cfg); -} - static struct iommu_device *apple_dart_probe_device(struct device *dev) { struct apple_dart_master_cfg *cfg =3D dev_iommu_priv_get(dev); @@ -780,7 +757,6 @@ static const struct iommu_ops apple_dart_iommu_ops =3D { .owner =3D THIS_MODULE, .default_domain_ops =3D &(const struct iommu_domain_ops) { .attach_dev =3D apple_dart_attach_dev, - .detach_dev =3D apple_dart_detach_dev, .map_pages =3D apple_dart_map_pages, .unmap_pages =3D apple_dart_unmap_pages, .flush_iotlb_all =3D apple_dart_flush_iotlb_all, --=20 2.34.1