There is no need to keep them in the header. The vEVENTQ version of these
two functions will turn out to be a different implementation and will not
share with this fault version. Thus, move them out of the header.

Signed-off-by: Nicolin Chen <nicol...@nvidia.com>
---
 drivers/iommu/iommufd/iommufd_private.h | 25 -------------------------
 drivers/iommu/iommufd/fault.c           | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/iommu/iommufd/iommufd_private.h 
b/drivers/iommu/iommufd/iommufd_private.h
index 0b1bafc7fd99..034df9b256f4 100644
--- a/drivers/iommu/iommufd/iommufd_private.h
+++ b/drivers/iommu/iommufd/iommufd_private.h
@@ -451,31 +451,6 @@ struct iommufd_fault {
        struct wait_queue_head wait_queue;
 };
 
-/* Fetch the first node out of the fault->deliver list */
-static inline struct iopf_group *
-iommufd_fault_deliver_fetch(struct iommufd_fault *fault)
-{
-       struct list_head *list = &fault->deliver;
-       struct iopf_group *group = NULL;
-
-       spin_lock(&fault->lock);
-       if (!list_empty(list)) {
-               group = list_first_entry(list, struct iopf_group, node);
-               list_del(&group->node);
-       }
-       spin_unlock(&fault->lock);
-       return group;
-}
-
-/* Restore a node back to the head of the fault->deliver list */
-static inline void iommufd_fault_deliver_restore(struct iommufd_fault *fault,
-                                                struct iopf_group *group)
-{
-       spin_lock(&fault->lock);
-       list_add(&group->node, &fault->deliver);
-       spin_unlock(&fault->lock);
-}
-
 struct iommufd_attach_handle {
        struct iommu_attach_handle handle;
        struct iommufd_device *idev;
diff --git a/drivers/iommu/iommufd/fault.c b/drivers/iommu/iommufd/fault.c
index d9a937450e55..e89d27bb9548 100644
--- a/drivers/iommu/iommufd/fault.c
+++ b/drivers/iommu/iommufd/fault.c
@@ -258,6 +258,31 @@ static void iommufd_compose_fault_message(struct 
iommu_fault *fault,
        hwpt_fault->cookie = cookie;
 }
 
+/* Fetch the first node out of the fault->deliver list */
+static struct iopf_group *
+iommufd_fault_deliver_fetch(struct iommufd_fault *fault)
+{
+       struct list_head *list = &fault->deliver;
+       struct iopf_group *group = NULL;
+
+       spin_lock(&fault->lock);
+       if (!list_empty(list)) {
+               group = list_first_entry(list, struct iopf_group, node);
+               list_del(&group->node);
+       }
+       spin_unlock(&fault->lock);
+       return group;
+}
+
+/* Restore a node back to the head of the fault->deliver list */
+static void iommufd_fault_deliver_restore(struct iommufd_fault *fault,
+                                         struct iopf_group *group)
+{
+       spin_lock(&fault->lock);
+       list_add(&group->node, &fault->deliver);
+       spin_unlock(&fault->lock);
+}
+
 static ssize_t iommufd_fault_fops_read(struct file *filep, char __user *buf,
                                       size_t count, loff_t *ppos)
 {
-- 
2.43.0


Reply via email to