Commit 2d471b20 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu: Streamline registration interface 



Rather than have separate opaque setter functions that are easy to
overlook and lead to repetitive boilerplate in drivers, let's pass the
relevant initialisation parameters directly to iommu_device_register().

Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/ab001b87c533b6f4db71eb90db6f888953986c36.1617285386.git.robin.murphy@arm.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent c0aec668

drivers/iommu/amd/init.c

+1 −2
Original line number Diff line number Diff line
@@ -1888,8 +1888,7 @@ static int __init iommu_init_pci(struct amd_iommu *iommu) 


	iommu_device_sysfs_add(&iommu->iommu, &iommu->dev->dev,

			       amd_iommu_groups, "ivhd%d", iommu->index);

	iommu_device_set_ops(&iommu->iommu, &amd_iommu_ops);

	iommu_device_register(&iommu->iommu);

	iommu_device_register(&iommu->iommu, &amd_iommu_ops, NULL);



	return pci_enable_device(iommu->dev);

}

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+1 −4
Original line number Diff line number Diff line
@@ -3666,10 +3666,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	iommu_device_set_ops(&smmu->iommu, &arm_smmu_ops);

	iommu_device_set_fwnode(&smmu->iommu, dev->fwnode);



	ret = iommu_device_register(&smmu->iommu);

	ret = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev);

	if (ret) {

		dev_err(dev, "Failed to register iommu\n");

		return ret;

drivers/iommu/arm/arm-smmu/arm-smmu.c

+1 −4
Original line number Diff line number Diff line
@@ -2161,10 +2161,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev) 
		return err;

	}



	iommu_device_set_ops(&smmu->iommu, &arm_smmu_ops);

	iommu_device_set_fwnode(&smmu->iommu, dev->fwnode);



	err = iommu_device_register(&smmu->iommu);

	err = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev);

	if (err) {

		dev_err(dev, "Failed to register iommu\n");

		return err;

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+1 −4
Original line number Diff line number Diff line
@@ -847,10 +847,7 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) 
		return ret;

	}



	iommu_device_set_ops(&qcom_iommu->iommu, &qcom_iommu_ops);

	iommu_device_set_fwnode(&qcom_iommu->iommu, dev->fwnode);



	ret = iommu_device_register(&qcom_iommu->iommu);

	ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev);

	if (ret) {

		dev_err(dev, "Failed to register iommu\n");

		return ret;

drivers/iommu/exynos-iommu.c

+1 −4
Original line number Diff line number Diff line
@@ -630,10 +630,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	iommu_device_set_ops(&data->iommu, &exynos_iommu_ops);

	iommu_device_set_fwnode(&data->iommu, &dev->of_node->fwnode);



	ret = iommu_device_register(&data->iommu);

	ret = iommu_device_register(&data->iommu, &exynos_iommu_ops, dev);

	if (ret)

		return ret;