Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp14379040rwb; Sun, 27 Nov 2022 23:30:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf618hgPIL/lLnvzSP/rJkA9PZK3nKtak+vfDTeUUWojjpBt272n46wIL85nv3xLh0+gvSWp X-Received: by 2002:a05:6402:b76:b0:469:cf2e:9220 with SMTP id cb22-20020a0564020b7600b00469cf2e9220mr29664254edb.314.1669620610540; Sun, 27 Nov 2022 23:30:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669620610; cv=none; d=google.com; s=arc-20160816; b=tJIwClP0tOFr9Dbv7MfdnVVCSysZjLzeqeULy36uFPCCq5h9cQeL2Fb4SWKOeWbBjm wHfqBbyg2vXpuWbAvM32fYdloJlgHYxlF31Zn+mh+P6SyTPLtTto2enc68KpNtTx/xqS /oUnBXuNhQAiqWnboxINdKV+/LhEHdAgJcqsD2Z0h9cA2FpOXGwQcIGGpKAFkw87tIJP SFFCHFnkJ4dUUQ4HXzJrb+ooHI0KHQh+4cYHa75ozTjE4WaK6dXhOlfs9nxgpIBydFtj xCtgwyrnmOt+AWfkyWHTd1WJ/xUb8lLaCR/6r0MKvtHVjeY4HCh+1SNbdL0uw8BsRMY4 bSeg== 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 :dkim-signature; bh=0ZEc+4WkaxZPef1cUL0OQgIQsRohw4kGNh8ENnPSAHs=; b=lu/j9V380xU1+BqJDbTLM5VIdTIsXf9gFi4nUE0055yNQjzsVdgZ8i8YjIpimgHQHY L6P1L61tTWKbKrcmSZ0qOMrs+i1lDR3iJ58/xEa/qcT6cjwLJ4PomSzOxUPpNqR8ESJs m2gzay76MXgQ2yE5HUgNmO+OnqOXlnIxw2rQ0CMSrU0KNsuK9AX6CGdrLvet4Z+rgzAT 3INxk7Y/lWGwy07a9NmTUlC91QTV0+VJ9JSavr1umUGKXjikIq/B29lFNTuJXHT7UUNy Jc4TYL09ogRIDf3+c9GJ0BSnSoT273aMVKr5qbE/AcFNuBxN/1cNRXWmIH8SXrbtxTRh LPAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=a8byyQAE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v22-20020a056402349600b00461bde34a12si10613628edc.627.2022.11.27.23.29.51; Sun, 27 Nov 2022 23:30:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=a8byyQAE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229972AbiK1Gy6 (ORCPT + 84 others); Mon, 28 Nov 2022 01:54:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbiK1Gyj (ORCPT ); Mon, 28 Nov 2022 01:54:39 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DC8B15719 for ; Sun, 27 Nov 2022 22:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669618472; x=1701154472; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8akeC95ae32s8n7uxnpCOPX3I9yHcltUgN/OgADfsrI=; b=a8byyQAEmXHjJ9tgVskw9KY+Ykw90CHgaVOZyWrtQPo1apF4qhqGfdaF 6lxvTzrBdZ1NDqUqavPOGLBpVvpiYOSAVGbQMZedYNx0epIDWNKHKHvJG LRKGYfZ8oESizSDZTedCXNCBEiWMF92kWxqkdx2XKQjGQpjZTTKp/gIWb iI3mLL6D63AmRupflVGmG5RhyQ2WuFup6ewjVyqxjrDeC0HDDggkKDF0T Oi1zhYCgOl2hgwpjId7wLfzypDRx2NBIHYHfHLBZ2u5KGKXK90zOcIefE SQB46r5M1XTgPdzXRvC3lKGMm09ZRYU/0yXSMoKrEZbhoFiQTu1r15Fx/ w==; X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="379016058" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="379016058" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 22:54:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="674120721" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="674120721" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga008.jf.intel.com with ESMTP; 27 Nov 2022 22:54:13 -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 v3 02/20] iommu/apple-dart: Remove detach_dev callback Date: Mon, 28 Nov 2022 14:46:30 +0800 Message-Id: <20221128064648.1934720-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128064648.1934720-1-baolu.lu@linux.intel.com> References: <20221128064648.1934720-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The IOMMU driver supports default domain, so the detach_dev op will never be called. Remove it to avoid dead code. Signed-off-by: Lu Baolu --- drivers/iommu/apple-dart.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index 4f4a323be0d0..6fbe6b275c79 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -535,22 +535,6 @@ static int apple_dart_attach_dev(struct iommu_domain *domain, return ret; } -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 = dev_iommu_priv_get(dev); - struct apple_dart_domain *dart_domain = to_dart_domain(domain); - - for_each_stream_map(i, cfg, stream_map) - apple_dart_hw_disable_dma(stream_map); - - if (domain->type == IOMMU_DOMAIN_DMA || - domain->type == 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 = dev_iommu_priv_get(dev); @@ -780,7 +764,6 @@ static const struct iommu_ops apple_dart_iommu_ops = { .owner = THIS_MODULE, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = apple_dart_attach_dev, - .detach_dev = apple_dart_detach_dev, .map_pages = apple_dart_map_pages, .unmap_pages = apple_dart_unmap_pages, .flush_iotlb_all = apple_dart_flush_iotlb_all, -- 2.34.1