Move URB cleanup from udl_urb_completion() to udl_put_urb().
udl_put_urb() is the inverse of udl_get_urb(). The new helper will
allow for further fixes.

Signed-off-by: Thomas Zimmermann <[email protected]>
---
 drivers/gpu/drm/udl/udl_drv.h  |  1 +
 drivers/gpu/drm/udl/udl_main.c | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 145bb95ccc48..9535e9c59950 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -73,6 +73,7 @@ int udl_modeset_init(struct udl_device *udl);
 struct drm_connector *udl_connector_init(struct drm_device *dev);
 
 struct urb *udl_get_urb(struct udl_device *udl);
+void udl_put_urb(struct urb *urb);
 
 int udl_submit_urb(struct udl_device *udl, struct urb *urb, size_t len);
 void udl_sync_pending_urbs(struct udl_device *udl);
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 17950fe3a0ec..936fb6565bdb 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -149,10 +149,6 @@ int udl_select_std_channel(struct udl_device *udl)
 
 void udl_urb_completion(struct urb *urb)
 {
-       struct urb_node *unode = urb->context;
-       struct udl_device *udl = unode->dev;
-       unsigned long flags;
-
        /* sync/async unlink faults aren't errors */
        if (urb->status) {
                if (!(urb->status == -ENOENT ||
@@ -164,14 +160,7 @@ void udl_urb_completion(struct urb *urb)
                }
        }
 
-       urb->transfer_buffer_length = udl->urbs.size; /* reset to actual */
-
-       spin_lock_irqsave(&udl->urbs.lock, flags);
-       list_add_tail(&unode->entry, &udl->urbs.list);
-       udl->urbs.available++;
-       spin_unlock_irqrestore(&udl->urbs.lock, flags);
-
-       wake_up(&udl->urbs.sleep);
+       udl_put_urb(urb);
 }
 
 static void udl_free_urb_list(struct udl_device *udl)
@@ -295,6 +284,22 @@ struct urb *udl_get_urb(struct udl_device *udl)
        return urb;
 }
 
+void udl_put_urb(struct urb *urb)
+{
+       struct urb_node *unode = urb->context;
+       struct udl_device *udl = unode->dev;
+       unsigned long flags;
+
+       urb->transfer_buffer_length = udl->urbs.size; /* reset to actual */
+
+       spin_lock_irqsave(&udl->urbs.lock, flags);
+       list_add_tail(&unode->entry, &udl->urbs.list);
+       udl->urbs.available++;
+       spin_unlock_irqrestore(&udl->urbs.lock, flags);
+
+       wake_up(&udl->urbs.sleep);
+}
+
 int udl_submit_urb(struct udl_device *udl, struct urb *urb, size_t len)
 {
        int ret;
-- 
2.56.0

Reply via email to