From: Christoph Hellwig <hch@lst.de>
To: Joerg Roedel <joro@8bytes.org>,
Alex Williamson <alex.williamson@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
Will Deacon <will@kernel.org>,
Kirti Wankhede <kwankhede@nvidia.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org, kvm@vger.kernel.org
Subject: [PATCH 6/6] iommu: remove iommu_dev_feature_enabled
Date: Mon, 10 May 2021 08:54:05 +0200 [thread overview]
Message-ID: <20210510065405.2334771-7-hch@lst.de> (raw)
In-Reply-To: <20210510065405.2334771-1-hch@lst.de>
Remove the unused iommu_dev_feature_enabled function.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 -
drivers/iommu/iommu.c | 13 -------------
include/linux/iommu.h | 9 ---------
3 files changed, 23 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 9689563eec0f30..77deabf2ab9c83 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2666,7 +2666,6 @@ static struct iommu_ops arm_smmu_ops = {
.of_xlate = arm_smmu_of_xlate,
.get_resv_regions = arm_smmu_get_resv_regions,
.put_resv_regions = generic_iommu_put_resv_regions,
- .dev_feat_enabled = arm_smmu_dev_feature_enabled,
.dev_enable_feat = arm_smmu_dev_enable_feature,
.dev_disable_feat = arm_smmu_dev_disable_feature,
.sva_bind = arm_smmu_sva_bind,
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index c4b92270946c2f..3d0d67b918a98f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2888,19 +2888,6 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)
}
EXPORT_SYMBOL_GPL(iommu_dev_disable_feature);
-bool iommu_dev_feature_enabled(struct device *dev, enum iommu_dev_features feat)
-{
- if (dev->iommu && dev->iommu->iommu_dev) {
- const struct iommu_ops *ops = dev->iommu->iommu_dev->ops;
-
- if (ops->dev_feat_enabled)
- return ops->dev_feat_enabled(dev, feat);
- }
-
- return false;
-}
-EXPORT_SYMBOL_GPL(iommu_dev_feature_enabled);
-
/**
* iommu_sva_bind_device() - Bind a process address space to a device
* @dev: the device
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index ef9e7dcef76e90..c0685c88b3f8b5 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -198,7 +198,6 @@ struct iommu_iotlb_gather {
* driver init to device driver init (default no)
* @dev_has/enable/disable_feat: per device entries to check/enable/disable
* iommu specific features.
- * @dev_feat_enabled: check enabled feature
* @aux_attach/detach_dev: aux-domain specific attach/detach entries.
* @sva_bind: Bind process address space to device
* @sva_unbind: Unbind process address space from device
@@ -252,7 +251,6 @@ struct iommu_ops {
bool (*is_attach_deferred)(struct iommu_domain *domain, struct device *dev);
/* Per device IOMMU features */
- bool (*dev_feat_enabled)(struct device *dev, enum iommu_dev_features f);
int (*dev_enable_feat)(struct device *dev, enum iommu_dev_features f);
int (*dev_disable_feat)(struct device *dev, enum iommu_dev_features f);
@@ -583,7 +581,6 @@ void iommu_release_device(struct device *dev);
int iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features f);
int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features f);
-bool iommu_dev_feature_enabled(struct device *dev, enum iommu_dev_features f);
struct iommu_sva *iommu_sva_bind_device(struct device *dev,
struct mm_struct *mm,
@@ -905,12 +902,6 @@ const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode)
return NULL;
}
-static inline bool
-iommu_dev_feature_enabled(struct device *dev, enum iommu_dev_features feat)
-{
- return false;
-}
-
static inline int
iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features feat)
{
--
2.30.2
next prev parent reply other threads:[~2021-05-10 6:54 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 6:53 more iommu dead code removal Christoph Hellwig
2021-05-10 6:54 ` [PATCH 1/6] iommu: remove the unused dev_has_feat method Christoph Hellwig
2021-05-10 6:54 ` [PATCH 2/6] iommu: remove the unused iommu_aux_get_pasid interface Christoph Hellwig
2021-05-10 6:54 ` [PATCH 3/6] vfio: remove the unused mdev iommu hook Christoph Hellwig
2021-05-10 15:54 ` Jason Gunthorpe
2021-05-13 3:28 ` Tian, Kevin
2021-05-13 12:00 ` Jason Gunthorpe
2021-05-14 6:27 ` Tian, Kevin
2021-05-14 6:54 ` Tian, Kevin
2021-05-14 12:19 ` Jason Gunthorpe
2021-05-14 12:58 ` Tian, Kevin
2021-05-14 13:31 ` Jason Gunthorpe
2021-05-17 12:22 ` Joerg Roedel
2021-05-17 12:30 ` Jason Gunthorpe
2021-05-17 12:53 ` Joerg Roedel
2021-05-17 13:35 ` Jason Gunthorpe
2021-05-17 15:35 ` Joerg Roedel
2021-05-19 15:23 ` Robin Murphy
2021-05-19 18:06 ` Jason Gunthorpe
2021-05-19 23:12 ` Tian, Kevin
2021-05-19 23:24 ` Jason Gunthorpe
2021-05-20 14:13 ` Robin Murphy
2021-05-20 14:34 ` Jason Gunthorpe
2021-05-24 18:18 ` Robin Murphy
2021-05-25 0:00 ` Jason Gunthorpe
2021-06-30 9:08 ` Tian, Kevin
2021-07-22 13:34 ` Christoph Hellwig
2021-07-23 5:36 ` Tian, Kevin
2021-07-23 5:41 ` Christoph Hellwig
2021-07-23 5:44 ` Tian, Kevin
2021-07-22 6:02 ` Tian, Kevin
2021-05-14 13:17 ` Tian, Kevin
2021-05-14 13:39 ` Jason Gunthorpe
2021-05-14 14:28 ` Tian, Kevin
2021-05-14 14:44 ` Jason Gunthorpe
2021-05-10 6:54 ` [PATCH 4/6] iommu: remove iommu_aux_{attach,detach}_device Christoph Hellwig
2021-05-10 6:54 ` [PATCH 5/6] iommu: remove IOMMU_DEV_FEAT_AUX Christoph Hellwig
2021-05-10 6:54 ` Christoph Hellwig [this message]
2021-05-10 11:54 ` more iommu dead code removal Jason Gunthorpe
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=20210510065405.2334771-7-hch@lst.de \
--to=hch@lst.de \
--cc=alex.williamson@redhat.com \
--cc=baolu.lu@linux.intel.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jgg@ziepe.ca \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--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).