From: John Garry <john.garry@huawei.com>
To: <joro@8bytes.org>, <will@kernel.org>
Cc: <iommu@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>, <robin.murphy@arm.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH v2 5/6] iommu: Delete iommu_domain_window_disable()
Date: Wed, 6 Jan 2021 21:35:10 +0800 [thread overview]
Message-ID: <1609940111-28563-6-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1609940111-28563-1-git-send-email-john.garry@huawei.com>
Function iommu_domain_window_disable() is not referenced in the tree, so
delete it.
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/iommu/iommu.c | 9 ---------
include/linux/iommu.h | 6 ------
2 files changed, 15 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 4f4edb087ce6..20201ef97b8f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2598,15 +2598,6 @@ int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr,
}
EXPORT_SYMBOL_GPL(iommu_domain_window_enable);
-void iommu_domain_window_disable(struct iommu_domain *domain, u32 wnd_nr)
-{
- if (unlikely(domain->ops->domain_window_disable == NULL))
- return;
-
- return domain->ops->domain_window_disable(domain, wnd_nr);
-}
-EXPORT_SYMBOL_GPL(iommu_domain_window_disable);
-
/**
* report_iommu_fault() - report about an IOMMU fault to the IOMMU framework
* @domain: the iommu domain where the fault has happened
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index b3f0e2018c62..72059fcfa108 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -514,7 +514,6 @@ extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
extern int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr,
phys_addr_t offset, u64 size,
int prot);
-extern void iommu_domain_window_disable(struct iommu_domain *domain, u32 wnd_nr);
extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev,
unsigned long iova, int flags);
@@ -746,11 +745,6 @@ static inline int iommu_domain_window_enable(struct iommu_domain *domain,
return -ENODEV;
}
-static inline void iommu_domain_window_disable(struct iommu_domain *domain,
- u32 wnd_nr)
-{
-}
-
static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova)
{
return 0;
--
2.26.2
next prev parent reply other threads:[~2021-01-06 13:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 13:35 [PATCH v2 0/6] IOMMU: Some more IOVA and core code tidy-up John Garry
2021-01-06 13:35 ` [PATCH v2 1/6] iova: Make has_iova_flush_queue() private John Garry
2021-01-06 13:35 ` [PATCH v2 2/6] iova: Delete copy_reserved_iova() John Garry
2021-01-06 13:35 ` [PATCH v2 3/6] iova: Stop exporting some more functions John Garry
2021-01-06 13:35 ` [PATCH v2 4/6] iommu: Stop exporting iommu_map_sg_atomic() John Garry
2021-01-06 13:35 ` John Garry [this message]
2021-01-06 13:35 ` [PATCH v2 6/6] iommu: Delete iommu_dev_has_feature() John Garry
2021-01-07 1:18 ` Lu Baolu
2021-01-07 9:13 ` John Garry
2021-01-09 9:09 ` Christoph Hellwig
2021-01-18 11:21 ` [PATCH v2 0/6] IOMMU: Some more IOVA and core code tidy-up Will Deacon
2021-01-27 11:29 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609940111-28563-6-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).