diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-12-13 14:24:34 -0500 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2017-02-17 08:27:23 -0500 |
commit | 620f74f51ccd9c954530655e46ce5907d88f1e9a (patch) | |
tree | 2afc5cdd3e23b7c78750dd12d0aae0df78bf68d8 | |
parent | 896bbc3ef1b065688163ce6c09c31e55fb4cd9f5 (diff) |
drm: Remove unused drm_platform midlayer
Now that the last driver has been converted, the drm_platform midlayer
is unused. Remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch
Reviewed-by: Sean Paul <seanpaul@chromium.org>
-rw-r--r-- | Documentation/gpu/drm-internals.rst | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_platform.c | 87 | ||||
-rw-r--r-- | include/drm/drmP.h | 3 |
4 files changed, 1 insertions, 94 deletions
diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst index e35920db1f4c..3930ec9150d6 100644 --- a/Documentation/gpu/drm-internals.rst +++ b/Documentation/gpu/drm-internals.rst | |||
@@ -240,9 +240,6 @@ drivers. | |||
240 | .. kernel-doc:: drivers/gpu/drm/drm_pci.c | 240 | .. kernel-doc:: drivers/gpu/drm/drm_pci.c |
241 | :export: | 241 | :export: |
242 | 242 | ||
243 | .. kernel-doc:: drivers/gpu/drm/drm_platform.c | ||
244 | :export: | ||
245 | |||
246 | Open/Close, File Operations and IOCTLs | 243 | Open/Close, File Operations and IOCTLs |
247 | ====================================== | 244 | ====================================== |
248 | 245 | ||
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 92de3991fa56..4601f697ccd6 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile | |||
@@ -7,7 +7,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ | |||
7 | drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ | 7 | drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ |
8 | drm_lock.o drm_memory.o drm_drv.o \ | 8 | drm_lock.o drm_memory.o drm_drv.o \ |
9 | drm_scatter.o drm_pci.o \ | 9 | drm_scatter.o drm_pci.o \ |
10 | drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \ | 10 | drm_sysfs.o drm_hashtab.o drm_mm.o \ |
11 | drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \ | 11 | drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \ |
12 | drm_info.o drm_encoder_slave.o \ | 12 | drm_info.o drm_encoder_slave.o \ |
13 | drm_trace_points.o drm_global.o drm_prime.o \ | 13 | drm_trace_points.o drm_global.o drm_prime.o \ |
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c deleted file mode 100644 index 56d2f93ed6b9..000000000000 --- a/drivers/gpu/drm/drm_platform.c +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | /* | ||
2 | * Derived from drm_pci.c | ||
3 | * | ||
4 | * Copyright 2003 José Fonseca. | ||
5 | * Copyright 2003 Leif Delgass. | ||
6 | * Copyright (c) 2009, Code Aurora Forum. | ||
7 | * All Rights Reserved. | ||
8 | * | ||
9 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
10 | * copy of this software and associated documentation files (the "Software"), | ||
11 | * to deal in the Software without restriction, including without limitation | ||
12 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
13 | * and/or sell copies of the Software, and to permit persons to whom the | ||
14 | * Software is furnished to do so, subject to the following conditions: | ||
15 | * | ||
16 | * The above copyright notice and this permission notice (including the next | ||
17 | * paragraph) shall be included in all copies or substantial portions of the | ||
18 | * Software. | ||
19 | * | ||
20 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
21 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
22 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
23 | * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
24 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
25 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
26 | */ | ||
27 | |||
28 | #include <linux/export.h> | ||
29 | #include <drm/drmP.h> | ||
30 | |||
31 | /* | ||
32 | * Register. | ||
33 | * | ||
34 | * \param platdev - Platform device struture | ||
35 | * \return zero on success or a negative number on failure. | ||
36 | * | ||
37 | * Attempt to gets inter module "drm" information. If we are first | ||
38 | * then register the character device and inter module information. | ||
39 | * Try and register, if we fail to register, backout previous work. | ||
40 | */ | ||
41 | |||
42 | static int drm_get_platform_dev(struct platform_device *platdev, | ||
43 | struct drm_driver *driver) | ||
44 | { | ||
45 | struct drm_device *dev; | ||
46 | int ret; | ||
47 | |||
48 | DRM_DEBUG("\n"); | ||
49 | |||
50 | dev = drm_dev_alloc(driver, &platdev->dev); | ||
51 | if (IS_ERR(dev)) | ||
52 | return PTR_ERR(dev); | ||
53 | |||
54 | dev->platformdev = platdev; | ||
55 | |||
56 | ret = drm_dev_register(dev, 0); | ||
57 | if (ret) | ||
58 | goto err_free; | ||
59 | |||
60 | return 0; | ||
61 | |||
62 | err_free: | ||
63 | drm_dev_unref(dev); | ||
64 | return ret; | ||
65 | } | ||
66 | |||
67 | /** | ||
68 | * drm_platform_init - Register a platform device with the DRM subsystem | ||
69 | * @driver: DRM device driver | ||
70 | * @platform_device: platform device to register | ||
71 | * | ||
72 | * Registers the specified DRM device driver and platform device with the DRM | ||
73 | * subsystem, initializing a drm_device structure and calling the driver's | ||
74 | * .load() function. | ||
75 | * | ||
76 | * NOTE: This function is deprecated, please use drm_dev_alloc() and | ||
77 | * drm_dev_register() instead and remove your &drm_driver.load callback. | ||
78 | * | ||
79 | * Return: 0 on success or a negative error code on failure. | ||
80 | */ | ||
81 | int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device) | ||
82 | { | ||
83 | DRM_DEBUG("\n"); | ||
84 | |||
85 | return drm_get_platform_dev(platform_device, driver); | ||
86 | } | ||
87 | EXPORT_SYMBOL(drm_platform_init); | ||
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 21a3a666a2fd..231a6cc925dd 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -819,9 +819,6 @@ static inline int drm_pci_set_busid(struct drm_device *dev, | |||
819 | extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask); | 819 | extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask); |
820 | extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); | 820 | extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); |
821 | 821 | ||
822 | /* platform section */ | ||
823 | extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device); | ||
824 | |||
825 | /* returns true if currently okay to sleep */ | 822 | /* returns true if currently okay to sleep */ |
826 | static __inline__ bool drm_can_sleep(void) | 823 | static __inline__ bool drm_can_sleep(void) |
827 | { | 824 | { |