misc cleanup patch from Adrian Bunk

1 files changed, 1 insertions, 19 deletions

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 720503b6..40579bfa 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -761,8 +761,6 @@ extern int __devinit drm_init(struct drm_driver *driver,
 			      struct pci_device_id *pciidlist);
 extern void __exit drm_exit(struct drm_driver *driver);
 extern void __exit drm_cleanup_pci(struct pci_dev *pdev);
-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 int drm_takedown(drm_device_t * dev);
@@ -770,17 +768,11 @@ 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_fasync(int fd, struct file *filp, int on);
 extern int drm_release(struct inode *inode, struct file *filp);
 unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 
 				/* 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 long drm_core_get_map_ofs(drm_map_t * map);
 extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
@@ -837,7 +829,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);
@@ -856,9 +847,6 @@ extern int drm_rmdraw(struct inode *inode, struct file *filp,
 		      unsigned int cmd, unsigned long arg);
 
 				/* 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,
@@ -870,12 +858,8 @@ extern int drm_lock(struct inode *inode, struct file *filp,
 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_addmap(struct inode *inode, struct file *filp,
@@ -916,9 +900,8 @@ 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 int drm_irq_uninstall(drm_device_t *dev);
 extern void drm_driver_irq_preinstall(drm_device_t * dev);
 extern void drm_driver_irq_postinstall(drm_device_t * dev);
 extern void drm_driver_irq_uninstall(drm_device_t * dev);
@@ -960,7 +943,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; /* 1 to enable debug output */
 extern unsigned int cards_limit;