Commit 884a53ef authored by Sascha Hauer's avatar Sascha Hauer Committed by Dave Airlie
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 54e88e06

drivers/gpu/drm/drm_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void drm_irq_vgaarb_nokms(void *cookie, bool state) 
 * \param dev DRM device.

 *

 * Initializes the IRQ related data. Installs the handler, calling the driver

 * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions

 * \c irq_preinstall() and \c irq_postinstall() functions

 * before and after the installation.

 */

int drm_irq_install(struct drm_device *dev)
@@ -385,7 +385,7 @@ EXPORT_SYMBOL(drm_irq_install); 
 *

 * \param dev DRM device.

 *

 * Calls the driver's \c drm_driver_irq_uninstall() function, and stops the irq.

 * Calls the driver's \c irq_uninstall() function, and stops the irq.

 */

int drm_irq_uninstall(struct drm_device *dev)

{

drivers/gpu/drm/drm_memory.c

+0 −19
Original line number Diff line number Diff line
@@ -37,25 +37,6 @@ 
#include <linux/export.h>

#include "drmP.h"



/**

 * Called when "/proc/dri/%dev%/mem" is read.

 *

 * \param buf output buffer.

 * \param start start of output data.

 * \param offset requested start offset.

 * \param len requested number of bytes.

 * \param eof whether there is no more data to return.

 * \param data private data.

 * \return number of written bytes.

 *

 * No-op.

 */

int drm_mem_info(char *buf, char **start, off_t offset,

		 int len, int *eof, void *data)

{

	return 0;

}



#if __OS_HAS_AGP

static void *agp_remap(unsigned long offset, unsigned long size,

		       struct drm_device * dev)

include/drm/drmP.h

+0 −9
Original line number Diff line number Diff line
@@ -1264,11 +1264,6 @@ extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); 


				/* Memory management support (drm_memory.h) */

#include "drm_memory.h"

extern void drm_mem_init(void);

extern int drm_mem_info(char *buf, char **start, off_t offset,

			int request, int *eof, void *data);

extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);



extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);

extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);

extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
@@ -1383,12 +1378,8 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev, 
				/* IRQ support (drm_irq.h) */

extern int drm_control(struct drm_device *dev, void *data,

		       struct drm_file *file_priv);

extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);

extern int drm_irq_install(struct drm_device *dev);

extern int drm_irq_uninstall(struct drm_device *dev);

extern void drm_driver_irq_preinstall(struct drm_device *dev);

extern void drm_driver_irq_postinstall(struct drm_device *dev);

extern void drm_driver_irq_uninstall(struct drm_device *dev);



extern int drm_vblank_init(struct drm_device *dev, int num_crtcs);

extern int drm_wait_vblank(struct drm_device *dev, void *data,