diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 06:12:45 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 03:43:27 -0400 |
commit | d4f68a7506e924e28a9153933076628002ba8bbc (patch) | |
tree | 339bb74dceb7476fd1ace6a18e499a440a045cb4 /drivers/gpu/drm/drm_usb.c | |
parent | c5786fe5f1c50941dbe27fc8b4aa1afee46ae893 (diff) |
drm: merge drm_usb into udl
This merges all the remains of drm_usb into its only user, udl. We can
then drop all the drm_usb stuff, including dev->usbdev.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_usb.c')
-rw-r--r-- | drivers/gpu/drm/drm_usb.c | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c deleted file mode 100644 index 9c434905d37f..000000000000 --- a/drivers/gpu/drm/drm_usb.c +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | #include <drm/drmP.h> | ||
2 | #include <drm/drm_usb.h> | ||
3 | #include <linux/usb.h> | ||
4 | #include <linux/module.h> | ||
5 | |||
6 | int drm_get_usb_dev(struct usb_interface *interface, | ||
7 | const struct usb_device_id *id, | ||
8 | struct drm_driver *driver) | ||
9 | { | ||
10 | struct drm_device *dev; | ||
11 | int ret; | ||
12 | |||
13 | DRM_DEBUG("\n"); | ||
14 | |||
15 | dev = drm_dev_alloc(driver, &interface->dev); | ||
16 | if (!dev) | ||
17 | return -ENOMEM; | ||
18 | |||
19 | dev->usbdev = interface_to_usbdev(interface); | ||
20 | usb_set_intfdata(interface, dev); | ||
21 | |||
22 | ret = drm_dev_register(dev, 0); | ||
23 | if (ret) | ||
24 | goto err_free; | ||
25 | |||
26 | DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", | ||
27 | driver->name, driver->major, driver->minor, driver->patchlevel, | ||
28 | driver->date, dev->primary->index); | ||
29 | |||
30 | return 0; | ||
31 | |||
32 | err_free: | ||
33 | drm_dev_unref(dev); | ||
34 | return ret; | ||
35 | |||
36 | } | ||
37 | EXPORT_SYMBOL(drm_get_usb_dev); | ||
38 | |||
39 | /** | ||
40 | * drm_usb_init - Register matching USB devices with the DRM subsystem | ||
41 | * @driver: DRM device driver | ||
42 | * @udriver: USB device driver | ||
43 | * | ||
44 | * Registers one or more devices matched by a USB driver with the DRM | ||
45 | * subsystem. | ||
46 | * | ||
47 | * Return: 0 on success or a negative error code on failure. | ||
48 | */ | ||
49 | int drm_usb_init(struct drm_driver *driver, struct usb_driver *udriver) | ||
50 | { | ||
51 | int res; | ||
52 | DRM_DEBUG("\n"); | ||
53 | |||
54 | res = usb_register(udriver); | ||
55 | return res; | ||
56 | } | ||
57 | EXPORT_SYMBOL(drm_usb_init); | ||
58 | |||
59 | /** | ||
60 | * drm_usb_exit - Unregister matching USB devices from the DRM subsystem | ||
61 | * @driver: DRM device driver | ||
62 | * @udriver: USB device driver | ||
63 | * | ||
64 | * Unregisters one or more devices matched by a USB driver from the DRM | ||
65 | * subsystem. | ||
66 | */ | ||
67 | void drm_usb_exit(struct drm_driver *driver, | ||
68 | struct usb_driver *udriver) | ||
69 | { | ||
70 | usb_deregister(udriver); | ||
71 | } | ||
72 | EXPORT_SYMBOL(drm_usb_exit); | ||
73 | |||
74 | MODULE_AUTHOR("David Airlie"); | ||
75 | MODULE_DESCRIPTION("USB DRM support"); | ||
76 | MODULE_LICENSE("GPL and additional rights"); | ||