On Wed, Sep 07, 2022 at 05:11:54PM +0200, Joerg Roedel wrote: > From: Joerg Roedel <[email protected]> > > 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]>
Reviewed-by: Jean-Philippe Brucker <[email protected]> > --- > drivers/iommu/virtio-iommu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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: > -- > 2.36.1 > _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
