Merge tag 'v3.16-rc1' into i2c/for-next

[karo-tx-linux.git] / drivers / gpu / drm / drm_usb.c

diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
index c3406aad294463718ccdaf1d83fc7636a0322b17..f2fe94aab901a8edbb6cbac827bad1e27a15b242 100644 (file)
--- a/drivers/gpu/drm/drm_usb.c
+++ b/drivers/gpu/drm/drm_usb.c
@@ -36,16 +36,6 @@ err_free:
 }
 EXPORT_SYMBOL(drm_get_usb_dev);
 
-static int drm_usb_get_irq(struct drm_device *dev)
-{
-       return 0;
-}
-
-static const char *drm_usb_get_name(struct drm_device *dev)
-{
-       return "USB";
-}
-
 static int drm_usb_set_busid(struct drm_device *dev,
                               struct drm_master *master)
 {
@@ -53,18 +43,24 @@ static int drm_usb_set_busid(struct drm_device *dev,
 }
 
 static struct drm_bus drm_usb_bus = {
-       .bus_type = DRIVER_BUS_USB,
-       .get_irq = drm_usb_get_irq,
-       .get_name = drm_usb_get_name,
        .set_busid = drm_usb_set_busid,
 };
-    
+
+/**
+ * drm_usb_init - Register matching USB devices with the DRM subsystem
+ * @driver: DRM device driver
+ * @udriver: USB device driver
+ *
+ * Registers one or more devices matched by a USB driver with the DRM
+ * subsystem.
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
 int drm_usb_init(struct drm_driver *driver, struct usb_driver *udriver)
 {
        int res;
        DRM_DEBUG("\n");
 
-       driver->kdriver.usb = udriver;
        driver->bus = &drm_usb_bus;
 
        res = usb_register(udriver);
@@ -72,6 +68,14 @@ int drm_usb_init(struct drm_driver *driver, struct usb_driver *udriver)
 }
 EXPORT_SYMBOL(drm_usb_init);
 
+/**
+ * drm_usb_exit - Unregister matching USB devices from the DRM subsystem
+ * @driver: DRM device driver
+ * @udriver: USB device driver
+ *
+ * Unregisters one or more devices matched by a USB driver from the DRM
+ * subsystem.
+ */
 void drm_usb_exit(struct drm_driver *driver,
                  struct usb_driver *udriver)
 {