Skip to content

Commit

Permalink
iommu/arm-smmu-v3: Use accessor functions for iommu private data
Browse files Browse the repository at this point in the history
Make use of dev_iommu_priv_set/get() functions in the code.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Link: https://lore.kernel.org/r/20200326150841.10083-10-joro@8bytes.org
  • Loading branch information
Joerg Roedel committed Mar 27, 2020
1 parent f9867f4 commit b7a9662
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/iommu/arm-smmu-v3.c
Original file line number Diff line number Diff line change
Expand Up @@ -2659,7 +2659,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
if (!fwspec)
return -ENOENT;

master = fwspec->iommu_priv;
master = dev_iommu_priv_get(dev);
smmu = master->smmu;

arm_smmu_detach_dev(master);
Expand Down Expand Up @@ -2795,7 +2795,7 @@ static int arm_smmu_add_device(struct device *dev)
if (!fwspec || fwspec->ops != &arm_smmu_ops)
return -ENODEV;

if (WARN_ON_ONCE(fwspec->iommu_priv))
if (WARN_ON_ONCE(dev_iommu_priv_get(dev)))
return -EBUSY;

smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
Expand All @@ -2810,7 +2810,7 @@ static int arm_smmu_add_device(struct device *dev)
master->smmu = smmu;
master->sids = fwspec->ids;
master->num_sids = fwspec->num_ids;
fwspec->iommu_priv = master;
dev_iommu_priv_set(dev, master);

/* Check the SIDs are in range of the SMMU and our stream table */
for (i = 0; i < master->num_sids; i++) {
Expand Down Expand Up @@ -2852,7 +2852,7 @@ static int arm_smmu_add_device(struct device *dev)
iommu_device_unlink(&smmu->iommu, dev);
err_free_master:
kfree(master);
fwspec->iommu_priv = NULL;
dev_iommu_priv_set(dev, NULL);
return ret;
}

Expand All @@ -2865,7 +2865,7 @@ static void arm_smmu_remove_device(struct device *dev)
if (!fwspec || fwspec->ops != &arm_smmu_ops)
return;

master = fwspec->iommu_priv;
master = dev_iommu_priv_get(dev);
smmu = master->smmu;
arm_smmu_detach_dev(master);
iommu_group_remove_device(dev);
Expand Down

0 comments on commit b7a9662

Please sign in to comment.