Commit de1dda7e authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu/vt-d: Remove domain_alloc_paging() 



This is duplicated by intel_iommu_domain_alloc_paging_flags(), just remove
it.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarYi Liu <yi.l.liu@intel.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/0-v1-b101d00c5ee5+17645-vtd_paging_flags_jgg@nvidia.com


Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 60f030f7

drivers/iommu/intel/iommu.c

+0 −16
Original line number Diff line number Diff line
@@ -4446,21 +4446,6 @@ static struct iommu_domain identity_domain = { 
	},

};



static struct iommu_domain *intel_iommu_domain_alloc_paging(struct device *dev)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct intel_iommu *iommu = info->iommu;

	struct dmar_domain *dmar_domain;

	bool first_stage;



	first_stage = first_level_by_default(iommu);

	dmar_domain = paging_domain_alloc(dev, first_stage);

	if (IS_ERR(dmar_domain))

		return ERR_CAST(dmar_domain);



	return &dmar_domain->domain;

}



const struct iommu_ops intel_iommu_ops = {

	.blocked_domain		= &blocking_domain,

	.release_domain		= &blocking_domain,
@@ -4469,7 +4454,6 @@ const struct iommu_ops intel_iommu_ops = { 
	.hw_info		= intel_iommu_hw_info,

	.domain_alloc_paging_flags = intel_iommu_domain_alloc_paging_flags,

	.domain_alloc_sva	= intel_svm_domain_alloc,

	.domain_alloc_paging	= intel_iommu_domain_alloc_paging,

	.domain_alloc_nested	= intel_iommu_domain_alloc_nested,

	.probe_device		= intel_iommu_probe_device,

	.release_device		= intel_iommu_release_device,