diff options
| author | Joerg Roedel <jroedel@suse.de> | 2022-09-07 17:11:54 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2022-09-09 09:27:14 +0200 |
| commit | c7883f8d2b0ab4b8e4df8cf37861523ad9ad1407 (patch) | |
| tree | 821603d7982a98044f7d2941aaecbb51a42e8bbc /drivers/iommu | |
| parent | 7f34891b151187c95511f2830a3994c8a54cabc1 (diff) | |
| download | linux-stable-c7883f8d2b0ab4b8e4df8cf37861523ad9ad1407.tar.gz linux-stable-c7883f8d2b0ab4b8e4df8cf37861523ad9ad1407.tar.bz2 linux-stable-c7883f8d2b0ab4b8e4df8cf37861523ad9ad1407.zip | |
iommu/virtio: Fix compile error with viommu_capable()
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
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/virtio-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index da463db9f12a..1b12825e2df1 100644 --- 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: |