iommu/virtio: Fix compile error with viommu_capable()

joergroedel · joergroedel · commit c7883f8d2b0a · 2022-09-09T09:27:14.000+02:00
A recent fix introduced viommu_capable() but other changes from Robin change the function signature of the call-back it is used for. When both changes are merged a compile error will happen because the function pointer types mismatch. Fix that by updating the viommu_capable() signature after the merge. Cc: Jean-Philippe Brucker <jean-philippe@linaro.org> Cc: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Joerg Roedel <jroedel@suse.de> Acked-by: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Link: https://lore.kernel.org/r/20220907151154.21911-1-joro@8bytes.org
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
@@ -1005,7 +1005,7 @@ static int viommu_of_xlate(struct device *dev, struct of_phandle_args *args)
 	return iommu_fwspec_add_ids(dev, args->args, 1);
 }
 
-static bool viommu_capable(enum iommu_cap cap)
+static bool viommu_capable(struct device *dev, enum iommu_cap cap)
 {
 	switch (cap) {
 	case IOMMU_CAP_CACHE_COHERENCY:

Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,7 @@ static int viommu_of_xlate(struct device dev, struct of_phandle_args args)`
`1005`	`1005`	`return iommu_fwspec_add_ids(dev, args->args, 1);`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`		`-static bool viommu_capable(enum iommu_cap cap)`
	`1008`	`+static bool viommu_capable(struct device *dev, enum iommu_cap cap)`
`1009`	`1009`	`{`
`1010`	`1010`	`switch (cap) {`
`1011`	`1011`	`case IOMMU_CAP_CACHE_COHERENCY:`