Move the code for freeing an URB into a separate helper function. Use
the helper for cleaning up the URB cache.

Signed-off-by: Thomas Zimmermann <[email protected]>
---
 drivers/gpu/drm/udl/udl_main.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index a799d7710a7b..1c3960974a10 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -147,6 +147,15 @@ int udl_select_std_channel(struct udl_device *udl)
        return ret < 0 ? ret : 0;
 }
 
+static void udl_free_bulk_urb(struct urb *urb)
+{
+       struct urb_node *unode = urb->context;
+
+       usb_free_coherent(urb->dev, unode->alloc_size, urb->transfer_buffer, 
urb->transfer_dma);
+       kfree(unode);
+       usb_free_urb(urb);
+}
+
 static void udl_urb_completion(struct urb *urb)
 {
        /* sync/async unlink faults aren't errors */
@@ -206,7 +215,6 @@ static struct urb *udl_alloc_bulk_urb(struct udl_device 
*udl, size_t size)
 
 static void udl_free_urb_list(struct udl_device *udl)
 {
-       struct urb_node *unode;
        struct urb *urb;
 
        DRM_DEBUG("Waiting for completes and freeing all render urbs\n");
@@ -219,12 +227,8 @@ static void udl_free_urb_list(struct udl_device *udl)
                spin_unlock_irq(&udl->urbs.lock);
                if (WARN_ON(!urb))
                        break;
-               unode = urb->context;
                /* Free each separately allocated piece */
-               usb_free_coherent(urb->dev, unode->alloc_size,
-                                 urb->transfer_buffer, urb->transfer_dma);
-               usb_free_urb(urb);
-               kfree(unode);
+               udl_free_bulk_urb(urb);
        }
 
        wake_up_all(&udl->urbs.sleep);
-- 
2.56.0

Reply via email to