[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220907151154.21911-1-joro@8bytes.org>
Date: Wed, 7 Sep 2022 17:11:54 +0200
From: Joerg Roedel <joro@...tes.org>
To: Joerg Roedel <joro@...tes.org>, iommu@...ts.linux.dev
Cc: Will Deacon <will@...nel.org>,
virtualization@...ts.linux-foundation.org,
linux-kernel@...r.kernel.org, Joerg Roedel <jroedel@...e.de>,
Jean-Philippe Brucker <jean-philippe@...aro.org>,
Robin Murphy <robin.murphy@....com>
Subject: [PATCH] iommu/virtio: Fix compile error with viommu_capable()
From: Joerg Roedel <jroedel@...e.de>
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@...aro.org>
Cc: Robin Murphy <robin.murphy@....com>
Signed-off-by: Joerg Roedel <jroedel@...e.de>
---
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
Powered by blists - more mailing lists