@@ -24,7 +24,7 @@ struct tegra_smmu_group {
struct list_head list;
struct tegra_smmu *smmu;
const struct tegra_smmu_group_soc *soc;
- struct iommu_group *group;
+ struct iommu_group *grp;
unsigned int swgroup;
};
@@ -911,7 +911,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev)
/* Find existing iommu_group associating with swgroup or group_soc */
list_for_each_entry(group, &smmu->groups, list)
if ((group->swgroup == swgroup) || (soc && group->soc == soc)) {
- grp = iommu_group_ref_get(group->group);
+ grp = iommu_group_ref_get(group->grp);
mutex_unlock(&smmu->lock);
return grp;
}
@@ -928,23 +928,23 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev)
group->soc = soc;
if (dev_is_pci(dev))
- group->group = pci_device_group(dev);
+ group->grp = pci_device_group(dev);
else
- group->group = generic_device_group(dev);
+ group->grp = generic_device_group(dev);
- if (IS_ERR(group->group)) {
+ if (IS_ERR(group->grp)) {
devm_kfree(smmu->dev, group);
mutex_unlock(&smmu->lock);
return NULL;
}
- iommu_group_set_iommudata(group->group, group, tegra_smmu_group_release);
+ iommu_group_set_iommudata(group->grp, group, tegra_smmu_group_release);
if (soc)
- iommu_group_set_name(group->group, soc->name);
+ iommu_group_set_name(group->grp, soc->name);
list_add_tail(&group->list, &smmu->groups);
mutex_unlock(&smmu->lock);
- return group->group;
+ return group->grp;
}
static int tegra_smmu_of_xlate(struct device *dev,