aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-02-29 03:06:21 -0500
committerDave Airlie <airlied@redhat.com>2012-02-29 05:18:29 -0500
commit884a53ef43eb69dfd48408659b9606e581aee7ba (patch)
tree7a881927509ba03381afa26e96496354d739438e /drivers
parent54e88e065ef5e89de797de0c98e50f2ed1c174db (diff)
drm: remove unused code
remove declared but unused functions from drmP.h, fix the comments where necessary. Also, remove drm_mem_info which is unused. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_irq.c4
-rw-r--r--drivers/gpu/drm/drm_memory.c19
2 files changed, 2 insertions, 21 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 44a5d0ad8b7c..c869436e238a 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -305,7 +305,7 @@ static void drm_irq_vgaarb_nokms(void *cookie, bool state)
305 * \param dev DRM device. 305 * \param dev DRM device.
306 * 306 *
307 * Initializes the IRQ related data. Installs the handler, calling the driver 307 * Initializes the IRQ related data. Installs the handler, calling the driver
308 * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions 308 * \c irq_preinstall() and \c irq_postinstall() functions
309 * before and after the installation. 309 * before and after the installation.
310 */ 310 */
311int drm_irq_install(struct drm_device *dev) 311int drm_irq_install(struct drm_device *dev)
@@ -385,7 +385,7 @@ EXPORT_SYMBOL(drm_irq_install);
385 * 385 *
386 * \param dev DRM device. 386 * \param dev DRM device.
387 * 387 *
388 * Calls the driver's \c drm_driver_irq_uninstall() function, and stops the irq. 388 * Calls the driver's \c irq_uninstall() function, and stops the irq.
389 */ 389 */
390int drm_irq_uninstall(struct drm_device *dev) 390int drm_irq_uninstall(struct drm_device *dev)
391{ 391{
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index c8b6b66d428d..c86a0f1a435c 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -37,25 +37,6 @@
37#include <linux/export.h> 37#include <linux/export.h>
38#include "drmP.h" 38#include "drmP.h"
39 39
40/**
41 * Called when "/proc/dri/%dev%/mem" is read.
42 *
43 * \param buf output buffer.
44 * \param start start of output data.
45 * \param offset requested start offset.
46 * \param len requested number of bytes.
47 * \param eof whether there is no more data to return.
48 * \param data private data.
49 * \return number of written bytes.
50 *
51 * No-op.
52 */
53int drm_mem_info(char *buf, char **start, off_t offset,
54 int len, int *eof, void *data)
55{
56 return 0;
57}
58
59#if __OS_HAS_AGP 40#if __OS_HAS_AGP
60static void *agp_remap(unsigned long offset, unsigned long size, 41static void *agp_remap(unsigned long offset, unsigned long size,
61 struct drm_device * dev) 42 struct drm_device * dev)