Skip to content

Commit

Permalink
iommu/virtio: Fix compile error with viommu_capable()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Robin Murphy <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
Acked-by: Robin Murphy <[email protected]>
Reviewed-by: Jean-Philippe Brucker <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
joergroedel committed Sep 9, 2022
1 parent 7f34891 commit c7883f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/iommu/virtio-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit c7883f8

Please sign in to comment.