Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp13231609rwl; Wed, 4 Jan 2023 05:30:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXu+mGqTAZN5sjdJ78fIj/PPXSZvbhnlMOQsGBdd/11Egoxe2mPDMlAeX+b35cj0CuPREbrh X-Received: by 2002:a05:6a21:3d0a:b0:ac:6543:d515 with SMTP id bi10-20020a056a213d0a00b000ac6543d515mr61689489pzc.42.1672839053755; Wed, 04 Jan 2023 05:30:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672839053; cv=none; d=google.com; s=arc-20160816; b=QjQLIYZw9rjrOPkToJnrU53QpVkosnTJLEBwfhr8KpTKa52dhMjwgNVQejRpXlPgGo iXV1jf8vybtUaI/Yw6i+o7IgfCrK3DiSJcqJ8H4gXxebrmWFz985u1nNZHOGiSO/EfTB sRSPhzz42vkT6yuuSP61h7vIih8157fGLJjdELi3nmRjABK+qZYhgQfPtthfDGpr8GyS Qwa8dTA3FG3FOjIzhvyMCS/Y3sYRzziEFbT/ZQuhRVHwVtR9xfRU50+DM6HV6WT1Zdm2 iOt7NL3c7Z8MkK4nv+8Kpo7hDUnxB+rWWNAlQrZ1tNbXFlxWhykDMIRI3Ya8F9j62XII 61Pg== 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=eCOtFU7GFvs0jIEchngf8XVXomOfZHlJRPaCvIYUixw=; b=Dw9NwbedZ61Ut6LzV0tQ8Ckfohur/oSYuua2rnEvdBHmJTqrHLQ57Zx1vI2FrtRSYj o6ptX/K8ws/3yb/E4ZehEg2XygccedJ4COOQ5RsN53Ss3UgYMiwcX6YfdQGexAvvAWLl zPw2VfQHZLUE124Uh34Z2DHaBaCAUj7NLY4fr7lL6Cj7e1KjZ+zE9X/dmNU2axFUma+A PlxmVDg2WoKJjRBF79olc9nLQalxusOwlBAauyDjTQgiBSSTCfJLL9d00f+ouyUWssT5 CLnoX+E7K39IJ6zAsQYpPPX4vqZa3nUt14Ee6mufmQW2oScKTuK3R+HdYXneKvi0MSfU B8KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mar6kklp; 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 y1-20020a656c01000000b0047842533cc4si34782471pgu.838.2023.01.04.05.30.45; Wed, 04 Jan 2023 05:30:53 -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=mar6kklp; 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 S234548AbjADNGg (ORCPT + 57 others); Wed, 4 Jan 2023 08:06:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233028AbjADNGC (ORCPT ); Wed, 4 Jan 2023 08:06:02 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1579A13CC4 for ; Wed, 4 Jan 2023 05:06:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672837562; x=1704373562; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+SzowCr9VibyAQ07C1GMexR24eLRziCKELoBzuCji8k=; b=mar6kklpscJnyV9X3kjWaXwbNhi6WOphHVYnCbENYa2OdtqhaTkpciFA ze1g5UncePbnku2w2DHGXX1pcvy45W32RzqhQ//qXF1j8oalE6+w//cBp J6lQK0Wk4j8/+gP3K47fhjv5DYBq+Vj49VF5uhr1azj3gZftuNF2Bgzzk Tq/wOXbC1hYWcE0PFxoAxcZgtE6f7i2N05MouosZbjKJhiVKD0Z57+o2t b745hvZNA9c385kuRb/f6NHSj8souaReNU15AQilgsZzYeZ3nMfNNQ/nP ldXFfyx04UwGBjKeYrWHftwFrXM7ClYIoZH4HD4AlaqS72lBfG0zH1zlx Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="320639773" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="320639773" 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:06:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="797529062" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="797529062" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga001.fm.intel.com with ESMTP; 04 Jan 2023 05:05:55 -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 06/19] iommu/mtk: Remove detach_dev callback Date: Wed, 4 Jan 2023 20:57:12 +0800 Message-Id: <20230104125725.271850-7-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: 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/mtk_iommu.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 2badd6acfb23..d5a4955910ff 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -710,14 +710,6 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, return ret; } -static void mtk_iommu_detach_device(struct iommu_domain *domain, - struct device *dev) -{ - struct mtk_iommu_data *data = dev_iommu_priv_get(dev); - - mtk_iommu_config(data, dev, false, 0); -} - static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t pgsize, size_t pgcount, int prot, gfp_t gfp, size_t *mapped) @@ -946,7 +938,6 @@ static const struct iommu_ops mtk_iommu_ops = { .owner = THIS_MODULE, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = mtk_iommu_attach_device, - .detach_dev = mtk_iommu_detach_device, .map_pages = mtk_iommu_map, .unmap_pages = mtk_iommu_unmap, .flush_iotlb_all = mtk_iommu_flush_iotlb_all, -- 2.34.1