iommu/vt-d: Change return type of dmar_insert_one_dev_info()
Subsystems (2)
Lu Baolu
maintainerPATCH 1/1 iommu/vt-d: Change return type of dmar_insert_one_dev_info()
The dmar_insert_one_dev_info() returns the pass-in domain on success and NULL on failure. This doesn't make much sense. Change it to an integer.
--- drivers/iommu/intel/iommu.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/iommu/intel/iommu.c +9 -15
@@ -2474,10 +2474,9 @@ static bool dev_is_real_dma_subdevice(struct device *dev)pci_real_dma_dev (to_pci_dev (dev)) !=to_pci_dev (dev); } -static struct dmar_domain *dmar_insert_one_dev_info (struct intel_iommu *iommu, -int bus,int devfn, -struct device *dev, -struct dmar_domain *domain) +static int dmar_insert_one_dev_info (struct intel_iommu *iommu,int bus, +int devfn,struct device *dev, +struct dmar_domain *domain) {struct device_domain_info *info =dev_iommu_priv_get (dev);unsigned long flags;
@@ -2490,7 +2489,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,spin_unlock (&iommu->lock);if (ret) {spin_unlock_irqrestore (&device_domain_lock, flags); -return NULL ; +return -ENODEV ; }list_add (&info->link, &domain->devices);spin_unlock_irqrestore (&device_domain_lock, flags);
@@ -2501,7 +2500,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,if (ret) {dev_err (dev,"PASID table allocation failed\n" );dmar_remove_one_dev_info (dev); -return NULL ; +return -ENOMEM ; }/* Setup the PASID entry for requests without PASID: */
@@ -2519,17 +2518,17 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,if (ret) {dev_err (dev,"Setup RID2PASID failed\n" );dmar_remove_one_dev_info (dev); -return NULL ; +return -ENODEV ; } }if (domain_context_mapping (domain, dev)) {dev_err (dev,"Domain context map failed\n" );dmar_remove_one_dev_info (dev); -return NULL ; +return -ENODEV ; } -return domain; +return 0 ; } static int iommu_domain_identity_map(struct dmar_domain *domain,
@@ -2607,7 +2606,6 @@ static int __init si_domain_init(int hw)static int domain_add_dev_info (struct dmar_domain *domain,struct device *dev) { -struct dmar_domain *ndomain;struct intel_iommu *iommu;u8 bus, devfn;
@@ -2615,11 +2613,7 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)if (!iommu)return -ENODEV ; - ndomain =dmar_insert_one_dev_info (iommu, bus, devfn, dev, domain); -if (ndomain != domain) -return -EBUSY ; - -return 0 ; +return dmar_insert_one_dev_info (iommu, bus, devfn, dev, domain); }static bool device_has_rmrr (struct device *dev)
Signature · 1 line
2.25.1
Quoted 2 lines · Lu Baolu
The
dmar_insert_one_dev_info()returns the pass-in domain on success and NULL on failure. This doesn't make much sense. Change it to an integer.
Looks sensibel. Why not also merge it with domain_add_dev_info while you're at it?
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerQuoted 6 lines · Christoph Hellwig
Quoted 2 lines · Lu Baolu
The
dmar_insert_one_dev_info()returns the pass-in domain on success and NULL on failure. This doesn't make much sense. Change it to an integer.Looks sensibel. Why not also merge it with
domain_add_dev_infowhile you're at it?
It looks cleaner that way. Thanks a lot!
Best regards,
baolu