drm: misc cleanup

[linux-beck.git] / drivers / char / drm / drmP.h

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 2c7b1fc3bb2eb19379e7a9033969cd509768c300..5df09cc8c6db62a7eab1a2a3e1d6061bbb54c997 100644 (file)
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -774,8 +774,6 @@ extern int           drm_cpu_valid( void );
                                /* Driver support (drm_drv.h) */
 extern int           drm_init(struct drm_driver *driver);
 extern void          drm_exit(struct drm_driver *driver);
-extern int           drm_version(struct inode *inode, struct file *filp,
-                                 unsigned int cmd, unsigned long arg);
 extern int           drm_ioctl(struct inode *inode, struct file *filp,
                                unsigned int cmd, unsigned long arg);
 extern long         drm_compat_ioctl(struct file *filp,
@@ -785,21 +783,13 @@ extern int           drm_takedown(drm_device_t * dev);
                                /* Device support (drm_fops.h) */
 extern int           drm_open(struct inode *inode, struct file *filp);
 extern int           drm_stub_open(struct inode *inode, struct file *filp);
-extern int          drm_open_helper(struct inode *inode, struct file *filp,
-                                     drm_device_t *dev);
 extern int          drm_flush(struct file *filp);
 extern int          drm_fasync(int fd, struct file *filp, int on);
 extern int           drm_release(struct inode *inode, struct file *filp);
 
                                /* Mapping support (drm_vm.h) */
-extern void         drm_vm_open(struct vm_area_struct *vma);
-extern void         drm_vm_close(struct vm_area_struct *vma);
-extern void         drm_vm_shm_close(struct vm_area_struct *vma);
-extern int          drm_mmap_dma(struct file *filp,
-                                  struct vm_area_struct *vma);
 extern int          drm_mmap(struct file *filp, struct vm_area_struct *vma);
 extern unsigned int  drm_poll(struct file *filp, struct poll_table_struct *wait);
-extern ssize_t       drm_read(struct file *filp, char __user *buf, size_t count, loff_t *off);
 
                                /* Memory management support (drm_memory.h) */
 #include "drm_memory.h"
@@ -853,9 +843,6 @@ extern int       drm_newctx( struct inode *inode, struct file *filp,
 extern int          drm_rmctx( struct inode *inode, struct file *filp,
                                 unsigned int cmd, unsigned long arg );
 
-extern int          drm_context_switch(drm_device_t *dev, int old, int new);
-extern int          drm_context_switch_complete(drm_device_t *dev, int new);
-
 extern int          drm_ctxbitmap_init( drm_device_t *dev );
 extern void         drm_ctxbitmap_cleanup( drm_device_t *dev );
 extern void          drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle );
@@ -873,9 +860,6 @@ extern int       drm_rmdraw(struct inode *inode, struct file *filp,
 
 
                                /* Authentication IOCTL support (drm_auth.h) */
-extern int          drm_add_magic(drm_device_t *dev, drm_file_t *priv,
-                                   drm_magic_t magic);
-extern int          drm_remove_magic(drm_device_t *dev, drm_magic_t magic);
 extern int          drm_getmagic(struct inode *inode, struct file *filp,
                                   unsigned int cmd, unsigned long arg);
 extern int          drm_authmagic(struct inode *inode, struct file *filp,
@@ -892,13 +876,9 @@ extern int           drm_unlock(struct inode *inode, struct file *filp,
                                 unsigned int cmd, unsigned long arg);
 extern int          drm_lock_take(__volatile__ unsigned int *lock,
                                    unsigned int context);
-extern int          drm_lock_transfer(drm_device_t *dev,
-                                       __volatile__ unsigned int *lock,
-                                       unsigned int context);
 extern int          drm_lock_free(drm_device_t *dev,
                                    __volatile__ unsigned int *lock,
                                    unsigned int context);
-extern int           drm_notifier(void *priv);
 
                                /* Buffer management support (drm_bufs.h) */
 extern int          drm_order( unsigned long size );
@@ -926,7 +906,6 @@ extern void      drm_core_reclaim_buffers(drm_device_t *dev, struct file *filp);
                                /* IRQ support (drm_irq.h) */
 extern int           drm_control( struct inode *inode, struct file *filp,
                                   unsigned int cmd, unsigned long arg );
-extern int           drm_irq_install( drm_device_t *dev );
 extern int           drm_irq_uninstall( drm_device_t *dev );
 extern irqreturn_t   drm_irq_handler( DRM_IRQ_ARGS );
 extern void          drm_driver_irq_preinstall( drm_device_t *dev );
@@ -966,7 +945,6 @@ extern int            drm_agp_unbind_memory(DRM_AGP_MEM *handle);
 extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
                     struct drm_driver *driver);
 extern int drm_put_dev(drm_device_t * dev);
-extern int drm_get_head(drm_device_t * dev, drm_head_t *head);
 extern int drm_put_head(drm_head_t * head);
 extern unsigned int   drm_debug;
 extern unsigned int   drm_cards_limit;