Clean up the URB cache as part of the USB device cleanup with managed
helpers. Remove udl_drop_usb() and the clean-up code from udl_init().
All happens automatically.

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

diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 1922988625eb..f84d020a1953 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -110,10 +110,8 @@ static int udl_usb_probe(struct usb_interface *interface,
 static void udl_usb_disconnect(struct usb_interface *interface)
 {
        struct drm_device *dev = usb_get_intfdata(interface);
-       struct udl_device *udl = to_udl(dev);
 
        drm_dev_unplug(dev);
-       udl_drop_usb(udl);
 }
 
 /*
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 4736d83aec9a..2722625ab7a8 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -84,7 +84,6 @@ int udl_render_hline(struct udl_device *udl, int log_bpp, 
struct urb **urb_ptr,
                     const char *front, char **urb_buf_ptr,
                     u32 byte_offset, u32 device_byte_offset, u32 byte_width);
 
-int udl_drop_usb(struct udl_device *udl);
 int udl_select_std_channel(struct udl_device *udl);
 
 #endif
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 821725cbebbe..21b85d9c7d69 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2009 Bernie Thompson <[email protected]>
  */
 
+#include <linux/device.h>
 #include <linux/unaligned.h>
 
 #include <drm/drm.h>
@@ -234,9 +235,18 @@ static void udl_free_urb_list(struct udl_device *udl)
        wake_up_all(&udl->urbs.sleep);
 }
 
+static void udl_urb_list_release(void *data)
+{
+       struct udl_device *udl = data;
+
+       udl_free_urb_list(udl);
+}
+
 static int udl_alloc_urb_list(struct udl_device *udl, int count, size_t size)
 {
+       struct drm_device *drm = &udl->drm;
        size_t wanted_size = count * size;
+       int ret;
 
        spin_lock_init(&udl->urbs.lock);
        INIT_LIST_HEAD(&udl->urbs.list);
@@ -266,6 +276,13 @@ static int udl_alloc_urb_list(struct udl_device *udl, int 
count, size_t size)
                udl->urbs.available++;
        }
 
+       if (!udl->urbs.count)
+               return -ENOMEM;
+
+       ret = devm_add_action_or_reset(drm->dev, udl_urb_list_release, udl);
+       if (ret < 0)
+               return ret;
+
        DRM_DEBUG("allocated %d %d byte urbs\n", udl->urbs.count, (int) size);
 
        return udl->urbs.count;
@@ -389,34 +406,18 @@ int udl_init(struct udl_device *udl)
 
        ret = udl_parse_vendor_descriptor(udl);
        if (ret)
-               goto err;
+               return ret;
 
        if (udl_select_std_channel(udl))
                DRM_ERROR("Selecting channel failed\n");
 
-       if (!udl_alloc_urb_list(udl, WRITES_IN_FLIGHT, MAX_TRANSFER)) {
-               DRM_ERROR("udl_alloc_urb_list failed\n");
-               ret = -ENOMEM;
-               goto err;
-       }
+       ret = udl_alloc_urb_list(udl, WRITES_IN_FLIGHT, MAX_TRANSFER);
+       if (ret < 0)
+               return ret;
 
-       DRM_DEBUG("\n");
        ret = udl_modeset_init(udl);
        if (ret)
-               goto err;
-
-       return 0;
-
-err:
-       if (udl->urbs.count)
-               udl_free_urb_list(udl);
-       DRM_ERROR("%d\n", ret);
-       return ret;
-}
-
-int udl_drop_usb(struct udl_device *udl)
-{
-       udl_free_urb_list(udl);
+               return ret;
 
        return 0;
 }
-- 
2.56.0

Reply via email to