aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-11 01:53:27 -0400
committerDave Airlie <airlied@linux.ie>2007-07-11 01:53:27 -0400
commit84b1fd103dbbe01b5905db1444d3fc8afa9a7207 (patch)
tree2088f4c8e68553e2d4f5d55fa7a714eb3fa09f9e
parentc60ce623bd16137627009d05e311d877729f2ad6 (diff)
drm: remove drm_file_t, drm_device_t and drm_head_t typedefs
some drivers still todo. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat
-rw-r--r--drivers/char/drm/ati_pcigart.c4
-rw-r--r--drivers/char/drm/drmP.h136
-rw-r--r--drivers/char/drm/drm_agpsupport.c52
-rw-r--r--drivers/char/drm/drm_auth.c18
-rw-r--r--drivers/char/drm/drm_bufs.c56
-rw-r--r--drivers/char/drm/drm_context.c36
-rw-r--r--drivers/char/drm/drm_dma.c8
-rw-r--r--drivers/char/drm/drm_drawable.c2
-rw-r--r--drivers/char/drm/drm_drv.c16
-rw-r--r--drivers/char/drm/drm_fops.c22
-rw-r--r--drivers/char/drm/drm_ioctl.c24
-rw-r--r--drivers/char/drm/drm_irq.c22
-rw-r--r--drivers/char/drm/drm_lock.c8
-rw-r--r--drivers/char/drm/drm_memory.c6
-rw-r--r--drivers/char/drm/drm_os_linux.h4
-rw-r--r--drivers/char/drm/drm_pci.c6
-rw-r--r--drivers/char/drm/drm_proc.c26
-rw-r--r--drivers/char/drm/drm_scatter.c8
-rw-r--r--drivers/char/drm/drm_stub.c20
-rw-r--r--drivers/char/drm/drm_sysfs.c4
-rw-r--r--drivers/char/drm/drm_vm.c40
-rw-r--r--drivers/char/drm/i915_dma.c32
-rw-r--r--drivers/char/drm/i915_drv.h22
-rw-r--r--drivers/char/drm/i915_irq.c22
-rw-r--r--drivers/char/drm/i915_mem.c4
-rw-r--r--drivers/char/drm/r300_cmdbuf.c6
-rw-r--r--drivers/char/drm/radeon_cp.c24
-rw-r--r--drivers/char/drm/radeon_drv.h32
-rw-r--r--drivers/char/drm/radeon_irq.c24
-rw-r--r--drivers/char/drm/radeon_state.c62
-rw-r--r--drivers/char/drm/sis_drv.c4
-rw-r--r--drivers/char/drm/sis_drv.h6
-rw-r--r--drivers/char/drm/sis_mm.c10
-rw-r--r--drivers/char/drm/via_dma.c10
-rw-r--r--drivers/char/drm/via_dmablit.c20
-rw-r--r--drivers/char/drm/via_dmablit.h2
-rw-r--r--drivers/char/drm/via_drv.h30
-rw-r--r--drivers/char/drm/via_irq.c12
-rw-r--r--drivers/char/drm/via_map.c8
-rw-r--r--drivers/char/drm/via_mm.c4
-rw-r--r--drivers/char/drm/via_verifier.c6
-rw-r--r--drivers/char/drm/via_verifier.h6
42 files changed, 432 insertions, 432 deletions
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index 5b91bc04ea4e..f80ca01b2cfa 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -73,7 +73,7 @@ static void drm_ati_free_pcigart_table(void *address, int order)
73 free_pages((unsigned long)address, order); 73 free_pages((unsigned long)address, order);
74} 74}
75 75
76int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info) 76int drm_ati_pcigart_cleanup(struct drm_device *dev, drm_ati_pcigart_info *gart_info)
77{ 77{
78 drm_sg_mem_t *entry = dev->sg; 78 drm_sg_mem_t *entry = dev->sg;
79 unsigned long pages; 79 unsigned long pages;
@@ -122,7 +122,7 @@ int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
122} 122}
123EXPORT_SYMBOL(drm_ati_pcigart_cleanup); 123EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
124 124
125int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info) 125int drm_ati_pcigart_init(struct drm_device *dev, drm_ati_pcigart_info *gart_info)
126{ 126{
127 drm_sg_mem_t *entry = dev->sg; 127 drm_sg_mem_t *entry = dev->sg;
128 void *address = NULL; 128 void *address = NULL;
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index a785f3e79b1c..63ee0538813f 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -366,7 +366,7 @@ typedef struct drm_buf_entry {
366} drm_buf_entry_t; 366} drm_buf_entry_t;
367 367
368/** File private data */ 368/** File private data */
369typedef struct drm_file { 369struct drm_file {
370 int authenticated; 370 int authenticated;
371 int master; 371 int master;
372 int minor; 372 int minor;
@@ -379,7 +379,7 @@ typedef struct drm_file {
379 int remove_auth_on_close; 379 int remove_auth_on_close;
380 unsigned long lock_count; 380 unsigned long lock_count;
381 void *driver_priv; 381 void *driver_priv;
382} drm_file_t; 382};
383 383
384/** Wait queue */ 384/** Wait queue */
385typedef struct drm_queue { 385typedef struct drm_queue {
@@ -498,7 +498,7 @@ typedef struct drm_map drm_local_map_t;
498typedef struct drm_ctx_list { 498typedef struct drm_ctx_list {
499 struct list_head head; /**< list head */ 499 struct list_head head; /**< list head */
500 drm_context_t handle; /**< context handle */ 500 drm_context_t handle; /**< context handle */
501 drm_file_t *tag; /**< associated fd private data */ 501 struct drm_file *tag; /**< associated fd private data */
502} drm_ctx_list_t; 502} drm_ctx_list_t;
503 503
504typedef struct drm_vbl_sig { 504typedef struct drm_vbl_sig {
@@ -553,21 +553,21 @@ struct drm_device;
553struct drm_driver { 553struct drm_driver {
554 int (*load) (struct drm_device *, unsigned long flags); 554 int (*load) (struct drm_device *, unsigned long flags);
555 int (*firstopen) (struct drm_device *); 555 int (*firstopen) (struct drm_device *);
556 int (*open) (struct drm_device *, drm_file_t *); 556 int (*open) (struct drm_device *, struct drm_file *);
557 void (*preclose) (struct drm_device *, struct file * filp); 557 void (*preclose) (struct drm_device *, struct file * filp);
558 void (*postclose) (struct drm_device *, drm_file_t *); 558 void (*postclose) (struct drm_device *, struct drm_file *);
559 void (*lastclose) (struct drm_device *); 559 void (*lastclose) (struct drm_device *);
560 int (*unload) (struct drm_device *); 560 int (*unload) (struct drm_device *);
561 int (*dma_ioctl) (DRM_IOCTL_ARGS); 561 int (*dma_ioctl) (DRM_IOCTL_ARGS);
562 void (*dma_ready) (struct drm_device *); 562 void (*dma_ready) (struct drm_device *);
563 int (*dma_quiescent) (struct drm_device *); 563 int (*dma_quiescent) (struct drm_device *);
564 int (*context_ctor) (struct drm_device * dev, int context); 564 int (*context_ctor) (struct drm_device *dev, int context);
565 int (*context_dtor) (struct drm_device * dev, int context); 565 int (*context_dtor) (struct drm_device *dev, int context);
566 int (*kernel_context_switch) (struct drm_device * dev, int old, 566 int (*kernel_context_switch) (struct drm_device *dev, int old,
567 int new); 567 int new);
568 void (*kernel_context_switch_unlock) (struct drm_device * dev); 568 void (*kernel_context_switch_unlock) (struct drm_device *dev);
569 int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence); 569 int (*vblank_wait) (struct drm_device *dev, unsigned int *sequence);
570 int (*vblank_wait2) (struct drm_device * dev, unsigned int *sequence); 570 int (*vblank_wait2) (struct drm_device *dev, unsigned int *sequence);
571 int (*dri_library_name) (struct drm_device *dev, char *buf); 571 int (*dri_library_name) (struct drm_device *dev, char *buf);
572 572
573 /** 573 /**
@@ -581,22 +581,22 @@ struct drm_driver {
581 * card is absolutely \b not AGP (return of 0), absolutely \b is AGP 581 * card is absolutely \b not AGP (return of 0), absolutely \b is AGP
582 * (return of 1), or may or may not be AGP (return of 2). 582 * (return of 1), or may or may not be AGP (return of 2).
583 */ 583 */
584 int (*device_is_agp) (struct drm_device * dev); 584 int (*device_is_agp) (struct drm_device *dev);
585 585
586 /* these have to be filled in */ 586 /* these have to be filled in */
587 587
588 irqreturn_t(*irq_handler) (DRM_IRQ_ARGS); 588 irqreturn_t(*irq_handler) (DRM_IRQ_ARGS);
589 void (*irq_preinstall) (struct drm_device * dev); 589 void (*irq_preinstall) (struct drm_device *dev);
590 void (*irq_postinstall) (struct drm_device * dev); 590 void (*irq_postinstall) (struct drm_device *dev);
591 void (*irq_uninstall) (struct drm_device * dev); 591 void (*irq_uninstall) (struct drm_device *dev);
592 void (*reclaim_buffers) (struct drm_device * dev, struct file * filp); 592 void (*reclaim_buffers) (struct drm_device *dev, struct file * filp);
593 void (*reclaim_buffers_locked) (struct drm_device *dev, 593 void (*reclaim_buffers_locked) (struct drm_device *dev,
594 struct file *filp); 594 struct file *filp);
595 void (*reclaim_buffers_idlelocked) (struct drm_device *dev, 595 void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
596 struct file * filp); 596 struct file * filp);
597 unsigned long (*get_map_ofs) (struct drm_map * map); 597 unsigned long (*get_map_ofs) (struct drm_map * map);
598 unsigned long (*get_reg_ofs) (struct drm_device * dev); 598 unsigned long (*get_reg_ofs) (struct drm_device *dev);
599 void (*set_version) (struct drm_device * dev, 599 void (*set_version) (struct drm_device *dev,
600 struct drm_set_version *sv); 600 struct drm_set_version *sv);
601 601
602 int major; 602 int major;
@@ -619,19 +619,19 @@ struct drm_driver {
619 * that may contain multiple heads. Embed one per head of these in the 619 * that may contain multiple heads. Embed one per head of these in the
620 * private drm_device structure. 620 * private drm_device structure.
621 */ 621 */
622typedef struct drm_head { 622struct drm_head {
623 int minor; /**< Minor device number */ 623 int minor; /**< Minor device number */
624 struct drm_device *dev; 624 struct drm_device *dev;
625 struct proc_dir_entry *dev_root; /**< proc directory entry */ 625 struct proc_dir_entry *dev_root; /**< proc directory entry */
626 dev_t device; /**< Device number for mknod */ 626 dev_t device; /**< Device number for mknod */
627 struct class_device *dev_class; 627 struct class_device *dev_class;
628} drm_head_t; 628};
629 629
630/** 630/**
631 * DRM device structure. This structure represent a complete card that 631 * DRM device structure. This structure represent a complete card that
632 * may contain multiple heads. 632 * may contain multiple heads.
633 */ 633 */
634typedef struct drm_device { 634struct drm_device {
635 char *unique; /**< Unique identifier: e.g., busid */ 635 char *unique; /**< Unique identifier: e.g., busid */
636 int unique_len; /**< Length of unique field */ 636 int unique_len; /**< Length of unique field */
637 char *devname; /**< For /proc/interrupts */ 637 char *devname; /**< For /proc/interrupts */
@@ -749,7 +749,7 @@ typedef struct drm_device {
749 struct drm_driver *driver; 749 struct drm_driver *driver;
750 drm_local_map_t *agp_buffer_map; 750 drm_local_map_t *agp_buffer_map;
751 unsigned int agp_buffer_token; 751 unsigned int agp_buffer_token;
752 drm_head_t primary; /**< primary screen head */ 752 struct drm_head primary; /**< primary screen head */
753 753
754 /** \name Drawable information */ 754 /** \name Drawable information */
755 /*@{ */ 755 /*@{ */
@@ -759,7 +759,7 @@ typedef struct drm_device {
759 unsigned int drw_info_length; 759 unsigned int drw_info_length;
760 struct drm_drawable_info **drw_info; 760 struct drm_drawable_info **drw_info;
761 /*@} */ 761 /*@} */
762} drm_device_t; 762};
763 763
764static __inline__ int drm_core_check_feature(struct drm_device *dev, 764static __inline__ int drm_core_check_feature(struct drm_device *dev,
765 int feature) 765 int feature)
@@ -831,7 +831,7 @@ extern int drm_ioctl(struct inode *inode, struct file *filp,
831 unsigned int cmd, unsigned long arg); 831 unsigned int cmd, unsigned long arg);
832extern long drm_compat_ioctl(struct file *filp, 832extern long drm_compat_ioctl(struct file *filp,
833 unsigned int cmd, unsigned long arg); 833 unsigned int cmd, unsigned long arg);
834extern int drm_lastclose(drm_device_t *dev); 834extern int drm_lastclose(struct drm_device *dev);
835 835
836 /* Device support (drm_fops.h) */ 836 /* Device support (drm_fops.h) */
837extern int drm_open(struct inode *inode, struct file *filp); 837extern int drm_open(struct inode *inode, struct file *filp);
@@ -850,7 +850,7 @@ extern int drm_mem_info(char *buf, char **start, off_t offset,
850 int request, int *eof, void *data); 850 int request, int *eof, void *data);
851extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area); 851extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
852 852
853extern DRM_AGP_MEM *drm_alloc_agp(drm_device_t * dev, int pages, u32 type); 853extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type);
854extern int drm_free_agp(DRM_AGP_MEM * handle, int pages); 854extern int drm_free_agp(DRM_AGP_MEM * handle, int pages);
855extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start); 855extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
856extern int drm_unbind_agp(DRM_AGP_MEM * handle); 856extern int drm_unbind_agp(DRM_AGP_MEM * handle);
@@ -889,9 +889,9 @@ extern int drm_newctx(struct inode *inode, struct file *filp,
889extern int drm_rmctx(struct inode *inode, struct file *filp, 889extern int drm_rmctx(struct inode *inode, struct file *filp,
890 unsigned int cmd, unsigned long arg); 890 unsigned int cmd, unsigned long arg);
891 891
892extern int drm_ctxbitmap_init(drm_device_t * dev); 892extern int drm_ctxbitmap_init(struct drm_device *dev);
893extern void drm_ctxbitmap_cleanup(drm_device_t * dev); 893extern void drm_ctxbitmap_cleanup(struct drm_device *dev);
894extern void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle); 894extern void drm_ctxbitmap_free(struct drm_device *dev, int ctx_handle);
895 895
896extern int drm_setsareactx(struct inode *inode, struct file *filp, 896extern int drm_setsareactx(struct inode *inode, struct file *filp,
897 unsigned int cmd, unsigned long arg); 897 unsigned int cmd, unsigned long arg);
@@ -905,7 +905,7 @@ extern int drm_rmdraw(struct inode *inode, struct file *filp,
905 unsigned int cmd, unsigned long arg); 905 unsigned int cmd, unsigned long arg);
906extern int drm_update_drawable_info(struct inode *inode, struct file *filp, 906extern int drm_update_drawable_info(struct inode *inode, struct file *filp,
907 unsigned int cmd, unsigned long arg); 907 unsigned int cmd, unsigned long arg);
908extern struct drm_drawable_info *drm_get_drawable_info(drm_device_t *dev, 908extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,
909 drm_drawable_t id); 909 drm_drawable_t id);
910 910
911 /* Authentication IOCTL support (drm_auth.h) */ 911 /* Authentication IOCTL support (drm_auth.h) */
@@ -933,15 +933,15 @@ extern int drm_i_have_hw_lock(struct file *filp);
933extern int drm_kernel_take_hw_lock(struct file *filp); 933extern int drm_kernel_take_hw_lock(struct file *filp);
934 934
935 /* Buffer management support (drm_bufs.h) */ 935 /* Buffer management support (drm_bufs.h) */
936extern int drm_addbufs_agp(drm_device_t * dev, struct drm_buf_desc * request); 936extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
937extern int drm_addbufs_pci(drm_device_t * dev, struct drm_buf_desc * request); 937extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
938extern int drm_addmap(drm_device_t * dev, unsigned int offset, 938extern int drm_addmap(struct drm_device *dev, unsigned int offset,
939 unsigned int size, enum drm_map_type type, 939 unsigned int size, enum drm_map_type type,
940 enum drm_map_flags flags, drm_local_map_t ** map_ptr); 940 enum drm_map_flags flags, drm_local_map_t ** map_ptr);
941extern int drm_addmap_ioctl(struct inode *inode, struct file *filp, 941extern int drm_addmap_ioctl(struct inode *inode, struct file *filp,
942 unsigned int cmd, unsigned long arg); 942 unsigned int cmd, unsigned long arg);
943extern int drm_rmmap(drm_device_t * dev, drm_local_map_t * map); 943extern int drm_rmmap(struct drm_device *dev, drm_local_map_t * map);
944extern int drm_rmmap_locked(drm_device_t * dev, drm_local_map_t * map); 944extern int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t * map);
945extern int drm_rmmap_ioctl(struct inode *inode, struct file *filp, 945extern int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
946 unsigned int cmd, unsigned long arg); 946 unsigned int cmd, unsigned long arg);
947 947
@@ -956,56 +956,56 @@ extern int drm_freebufs(struct inode *inode, struct file *filp,
956 unsigned int cmd, unsigned long arg); 956 unsigned int cmd, unsigned long arg);
957extern int drm_mapbufs(struct inode *inode, struct file *filp, 957extern int drm_mapbufs(struct inode *inode, struct file *filp,
958 unsigned int cmd, unsigned long arg); 958 unsigned int cmd, unsigned long arg);
959extern unsigned long drm_get_resource_start(drm_device_t * dev, 959extern unsigned long drm_get_resource_start(struct drm_device *dev,
960 unsigned int resource); 960 unsigned int resource);
961extern unsigned long drm_get_resource_len(drm_device_t * dev, 961extern unsigned long drm_get_resource_len(struct drm_device *dev,
962 unsigned int resource); 962 unsigned int resource);
963 963
964 /* DMA support (drm_dma.h) */ 964 /* DMA support (drm_dma.h) */
965extern int drm_dma_setup(drm_device_t * dev); 965extern int drm_dma_setup(struct drm_device *dev);
966extern void drm_dma_takedown(drm_device_t * dev); 966extern void drm_dma_takedown(struct drm_device *dev);
967extern void drm_free_buffer(drm_device_t * dev, drm_buf_t * buf); 967extern void drm_free_buffer(struct drm_device *dev, drm_buf_t * buf);
968extern void drm_core_reclaim_buffers(drm_device_t * dev, struct file *filp); 968extern void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp);
969 969
970 /* IRQ support (drm_irq.h) */ 970 /* IRQ support (drm_irq.h) */
971extern int drm_control(struct inode *inode, struct file *filp, 971extern int drm_control(struct inode *inode, struct file *filp,
972 unsigned int cmd, unsigned long arg); 972 unsigned int cmd, unsigned long arg);
973extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); 973extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
974extern int drm_irq_uninstall(drm_device_t * dev); 974extern int drm_irq_uninstall(struct drm_device *dev);
975extern void drm_driver_irq_preinstall(drm_device_t * dev); 975extern void drm_driver_irq_preinstall(struct drm_device *dev);
976extern void drm_driver_irq_postinstall(drm_device_t * dev); 976extern void drm_driver_irq_postinstall(struct drm_device *dev);
977extern void drm_driver_irq_uninstall(drm_device_t * dev); 977extern void drm_driver_irq_uninstall(struct drm_device *dev);
978 978
979extern int drm_wait_vblank(struct inode *inode, struct file *filp, 979extern int drm_wait_vblank(struct inode *inode, struct file *filp,
980 unsigned int cmd, unsigned long arg); 980 unsigned int cmd, unsigned long arg);
981extern int drm_vblank_wait(drm_device_t * dev, unsigned int *vbl_seq); 981extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
982extern void drm_vbl_send_signals(drm_device_t * dev); 982extern void drm_vbl_send_signals(struct drm_device *dev);
983extern void drm_locked_tasklet(drm_device_t *dev, void(*func)(drm_device_t*)); 983extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*));
984 984
985 /* AGP/GART support (drm_agpsupport.h) */ 985 /* AGP/GART support (drm_agpsupport.h) */
986extern drm_agp_head_t *drm_agp_init(drm_device_t * dev); 986extern drm_agp_head_t *drm_agp_init(struct drm_device *dev);
987extern int drm_agp_acquire(drm_device_t * dev); 987extern int drm_agp_acquire(struct drm_device *dev);
988extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp, 988extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
989 unsigned int cmd, unsigned long arg); 989 unsigned int cmd, unsigned long arg);
990extern int drm_agp_release(drm_device_t * dev); 990extern int drm_agp_release(struct drm_device *dev);
991extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp, 991extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
992 unsigned int cmd, unsigned long arg); 992 unsigned int cmd, unsigned long arg);
993extern int drm_agp_enable(drm_device_t * dev, struct drm_agp_mode mode); 993extern int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);
994extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp, 994extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
995 unsigned int cmd, unsigned long arg); 995 unsigned int cmd, unsigned long arg);
996extern int drm_agp_info(drm_device_t * dev, struct drm_agp_info * info); 996extern int drm_agp_info(struct drm_device *dev, struct drm_agp_info * info);
997extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp, 997extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
998 unsigned int cmd, unsigned long arg); 998 unsigned int cmd, unsigned long arg);
999extern int drm_agp_alloc(drm_device_t *dev, struct drm_agp_buffer *request); 999extern int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);
1000extern int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp, 1000extern int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
1001 unsigned int cmd, unsigned long arg); 1001 unsigned int cmd, unsigned long arg);
1002extern int drm_agp_free(drm_device_t *dev, struct drm_agp_buffer *request); 1002extern int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
1003extern int drm_agp_free_ioctl(struct inode *inode, struct file *filp, 1003extern int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
1004 unsigned int cmd, unsigned long arg); 1004 unsigned int cmd, unsigned long arg);
1005extern int drm_agp_unbind(drm_device_t *dev, struct drm_agp_binding *request); 1005extern int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
1006extern int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp, 1006extern int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
1007 unsigned int cmd, unsigned long arg); 1007 unsigned int cmd, unsigned long arg);
1008extern int drm_agp_bind(drm_device_t *dev, struct drm_agp_binding *request); 1008extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
1009extern int drm_agp_bind_ioctl(struct inode *inode, struct file *filp, 1009extern int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
1010 unsigned int cmd, unsigned long arg); 1010 unsigned int cmd, unsigned long arg);
1011extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, 1011extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge,
@@ -1017,18 +1017,18 @@ extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
1017 /* Stub support (drm_stub.h) */ 1017 /* Stub support (drm_stub.h) */
1018extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 1018extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
1019 struct drm_driver *driver); 1019 struct drm_driver *driver);
1020extern int drm_put_dev(drm_device_t * dev); 1020extern int drm_put_dev(struct drm_device *dev);
1021extern int drm_put_head(drm_head_t * head); 1021extern int drm_put_head(struct drm_head *head);
1022extern unsigned int drm_debug; 1022extern unsigned int drm_debug;
1023extern unsigned int drm_cards_limit; 1023extern unsigned int drm_cards_limit;
1024extern drm_head_t **drm_heads; 1024extern struct drm_head **drm_heads;
1025extern struct class *drm_class; 1025extern struct class *drm_class;
1026extern struct proc_dir_entry *drm_proc_root; 1026extern struct proc_dir_entry *drm_proc_root;
1027 1027
1028extern drm_local_map_t *drm_getsarea(struct drm_device *dev); 1028extern drm_local_map_t *drm_getsarea(struct drm_device *dev);
1029 1029
1030 /* Proc support (drm_proc.h) */ 1030 /* Proc support (drm_proc.h) */
1031extern int drm_proc_init(drm_device_t * dev, 1031extern int drm_proc_init(struct drm_device *dev,
1032 int minor, 1032 int minor,
1033 struct proc_dir_entry *root, 1033 struct proc_dir_entry *root,
1034 struct proc_dir_entry **dev_root); 1034 struct proc_dir_entry **dev_root);
@@ -1044,21 +1044,21 @@ extern int drm_sg_free(struct inode *inode, struct file *filp,
1044 unsigned int cmd, unsigned long arg); 1044 unsigned int cmd, unsigned long arg);
1045 1045
1046 /* ATI PCIGART support (ati_pcigart.h) */ 1046 /* ATI PCIGART support (ati_pcigart.h) */
1047extern int drm_ati_pcigart_init(drm_device_t * dev, 1047extern int drm_ati_pcigart_init(struct drm_device *dev,
1048 drm_ati_pcigart_info * gart_info); 1048 drm_ati_pcigart_info * gart_info);
1049extern int drm_ati_pcigart_cleanup(drm_device_t * dev, 1049extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
1050 drm_ati_pcigart_info * gart_info); 1050 drm_ati_pcigart_info * gart_info);
1051 1051
1052extern drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, 1052extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
1053 size_t align, dma_addr_t maxaddr); 1053 size_t align, dma_addr_t maxaddr);
1054extern void __drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah); 1054extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
1055extern void drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah); 1055extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
1056 1056
1057 /* sysfs support (drm_sysfs.c) */ 1057 /* sysfs support (drm_sysfs.c) */
1058extern struct class *drm_sysfs_create(struct module *owner, char *name); 1058extern struct class *drm_sysfs_create(struct module *owner, char *name);
1059extern void drm_sysfs_destroy(struct class *cs); 1059extern void drm_sysfs_destroy(struct class *cs);
1060extern struct class_device *drm_sysfs_device_add(struct class *cs, 1060extern struct class_device *drm_sysfs_device_add(struct class *cs,
1061 drm_head_t *head); 1061 struct drm_head *head);
1062extern void drm_sysfs_device_remove(struct class_device *class_dev); 1062extern void drm_sysfs_device_remove(struct class_device *class_dev);
1063 1063
1064/* 1064/*
@@ -1090,7 +1090,7 @@ static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
1090 return NULL; 1090 return NULL;
1091} 1091}
1092 1092
1093static __inline__ int drm_device_is_agp(drm_device_t * dev) 1093static __inline__ int drm_device_is_agp(struct drm_device *dev)
1094{ 1094{
1095 if (dev->driver->device_is_agp != NULL) { 1095 if (dev->driver->device_is_agp != NULL) {
1096 int err = (*dev->driver->device_is_agp) (dev); 1096 int err = (*dev->driver->device_is_agp) (dev);
@@ -1103,7 +1103,7 @@ static __inline__ int drm_device_is_agp(drm_device_t * dev)
1103 return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP); 1103 return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
1104} 1104}
1105 1105
1106static __inline__ int drm_device_is_pcie(drm_device_t * dev) 1106static __inline__ int drm_device_is_pcie(struct drm_device *dev)
1107{ 1107{
1108 return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP); 1108 return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
1109} 1109}
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c
index d1a9e508af4b..059476a4e7eb 100644
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/char/drm/drm_agpsupport.c
@@ -48,7 +48,7 @@
48 * Verifies the AGP device has been initialized and acquired and fills in the 48 * Verifies the AGP device has been initialized and acquired and fills in the
49 * drm_agp_info structure with the information in drm_agp_head::agp_info. 49 * drm_agp_info structure with the information in drm_agp_head::agp_info.
50 */ 50 */
51int drm_agp_info(drm_device_t * dev, struct drm_agp_info * info) 51int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info)
52{ 52{
53 DRM_AGP_KERN *kern; 53 DRM_AGP_KERN *kern;
54 54
@@ -74,8 +74,8 @@ EXPORT_SYMBOL(drm_agp_info);
74int drm_agp_info_ioctl(struct inode *inode, struct file *filp, 74int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
75 unsigned int cmd, unsigned long arg) 75 unsigned int cmd, unsigned long arg)
76{ 76{
77 drm_file_t *priv = filp->private_data; 77 struct drm_file *priv = filp->private_data;
78 drm_device_t *dev = priv->head->dev; 78 struct drm_device *dev = priv->head->dev;
79 struct drm_agp_info info; 79 struct drm_agp_info info;
80 int err; 80 int err;
81 81
@@ -97,7 +97,7 @@ int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
97 * Verifies the AGP device hasn't been acquired before and calls 97 * Verifies the AGP device hasn't been acquired before and calls
98 * \c agp_backend_acquire. 98 * \c agp_backend_acquire.
99 */ 99 */
100int drm_agp_acquire(drm_device_t * dev) 100int drm_agp_acquire(struct drm_device * dev)
101{ 101{
102 if (!dev->agp) 102 if (!dev->agp)
103 return -ENODEV; 103 return -ENODEV;
@@ -126,9 +126,9 @@ EXPORT_SYMBOL(drm_agp_acquire);
126int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp, 126int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
127 unsigned int cmd, unsigned long arg) 127 unsigned int cmd, unsigned long arg)
128{ 128{
129 drm_file_t *priv = filp->private_data; 129 struct drm_file *priv = filp->private_data;
130 130
131 return drm_agp_acquire((drm_device_t *) priv->head->dev); 131 return drm_agp_acquire((struct drm_device *) priv->head->dev);
132} 132}
133 133
134/** 134/**
@@ -139,7 +139,7 @@ int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
139 * 139 *
140 * Verifies the AGP device has been acquired and calls \c agp_backend_release. 140 * Verifies the AGP device has been acquired and calls \c agp_backend_release.
141 */ 141 */
142int drm_agp_release(drm_device_t * dev) 142int drm_agp_release(struct drm_device * dev)
143{ 143{
144 if (!dev->agp || !dev->agp->acquired) 144 if (!dev->agp || !dev->agp->acquired)
145 return -EINVAL; 145 return -EINVAL;
@@ -152,8 +152,8 @@ EXPORT_SYMBOL(drm_agp_release);
152int drm_agp_release_ioctl(struct inode *inode, struct file *filp, 152int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
153 unsigned int cmd, unsigned long arg) 153 unsigned int cmd, unsigned long arg)
154{ 154{
155 drm_file_t *priv = filp->private_data; 155 struct drm_file *priv = filp->private_data;
156 drm_device_t *dev = priv->head->dev; 156 struct drm_device *dev = priv->head->dev;
157 157
158 return drm_agp_release(dev); 158 return drm_agp_release(dev);
159} 159}
@@ -168,7 +168,7 @@ int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
168 * Verifies the AGP device has been acquired but not enabled, and calls 168 * Verifies the AGP device has been acquired but not enabled, and calls
169 * \c agp_enable. 169 * \c agp_enable.
170 */ 170 */
171int drm_agp_enable(drm_device_t * dev, struct drm_agp_mode mode) 171int drm_agp_enable(struct drm_device * dev, struct drm_agp_mode mode)
172{ 172{
173 if (!dev->agp || !dev->agp->acquired) 173 if (!dev->agp || !dev->agp->acquired)
174 return -EINVAL; 174 return -EINVAL;
@@ -185,8 +185,8 @@ EXPORT_SYMBOL(drm_agp_enable);
185int drm_agp_enable_ioctl(struct inode *inode, struct file *filp, 185int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
186 unsigned int cmd, unsigned long arg) 186 unsigned int cmd, unsigned long arg)
187{ 187{
188 drm_file_t *priv = filp->private_data; 188 struct drm_file *priv = filp->private_data;
189 drm_device_t *dev = priv->head->dev; 189 struct drm_device *dev = priv->head->dev;
190 struct drm_agp_mode mode; 190 struct drm_agp_mode mode;
191 191
192 if (copy_from_user(&mode, (struct drm_agp_mode __user *) arg, sizeof(mode))) 192 if (copy_from_user(&mode, (struct drm_agp_mode __user *) arg, sizeof(mode)))
@@ -207,7 +207,7 @@ int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
207 * Verifies the AGP device is present and has been acquired, allocates the 207 * Verifies the AGP device is present and has been acquired, allocates the
208 * memory via alloc_agp() and creates a drm_agp_mem entry for it. 208 * memory via alloc_agp() and creates a drm_agp_mem entry for it.
209 */ 209 */
210int drm_agp_alloc(drm_device_t *dev, struct drm_agp_buffer *request) 210int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
211{ 211{
212 drm_agp_mem_t *entry; 212 drm_agp_mem_t *entry;
213 DRM_AGP_MEM *memory; 213 DRM_AGP_MEM *memory;
@@ -244,8 +244,8 @@ EXPORT_SYMBOL(drm_agp_alloc);
244int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp, 244int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
245 unsigned int cmd, unsigned long arg) 245 unsigned int cmd, unsigned long arg)
246{ 246{
247 drm_file_t *priv = filp->private_data; 247 struct drm_file *priv = filp->private_data;
248 drm_device_t *dev = priv->head->dev; 248 struct drm_device *dev = priv->head->dev;
249 struct drm_agp_buffer request; 249 struct drm_agp_buffer request;
250 struct drm_agp_buffer __user *argp = (void __user *)arg; 250 struct drm_agp_buffer __user *argp = (void __user *)arg;
251 int err; 251 int err;
@@ -281,7 +281,7 @@ int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
281 * 281 *
282 * Walks through drm_agp_head::memory until finding a matching handle. 282 * Walks through drm_agp_head::memory until finding a matching handle.
283 */ 283 */
284static drm_agp_mem_t *drm_agp_lookup_entry(drm_device_t * dev, 284static drm_agp_mem_t *drm_agp_lookup_entry(struct drm_device * dev,
285 unsigned long handle) 285 unsigned long handle)
286{ 286{
287 drm_agp_mem_t *entry; 287 drm_agp_mem_t *entry;
@@ -305,7 +305,7 @@ static drm_agp_mem_t *drm_agp_lookup_entry(drm_device_t * dev,
305 * Verifies the AGP device is present and acquired, looks-up the AGP memory 305 * Verifies the AGP device is present and acquired, looks-up the AGP memory
306 * entry and passes it to the unbind_agp() function. 306 * entry and passes it to the unbind_agp() function.
307 */ 307 */
308int drm_agp_unbind(drm_device_t *dev, struct drm_agp_binding *request) 308int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)
309{ 309{
310 drm_agp_mem_t *entry; 310 drm_agp_mem_t *entry;
311 int ret; 311 int ret;
@@ -326,8 +326,8 @@ EXPORT_SYMBOL(drm_agp_unbind);
326int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp, 326int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
327 unsigned int cmd, unsigned long arg) 327 unsigned int cmd, unsigned long arg)
328{ 328{
329 drm_file_t *priv = filp->private_data; 329 struct drm_file *priv = filp->private_data;
330 drm_device_t *dev = priv->head->dev; 330 struct drm_device *dev = priv->head->dev;
331 struct drm_agp_binding request; 331 struct drm_agp_binding request;
332 332
333 if (copy_from_user 333 if (copy_from_user
@@ -350,7 +350,7 @@ int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
350 * is currently bound into the GATT. Looks-up the AGP memory entry and passes 350 * is currently bound into the GATT. Looks-up the AGP memory entry and passes
351 * it to bind_agp() function. 351 * it to bind_agp() function.
352 */ 352 */
353int drm_agp_bind(drm_device_t *dev, struct drm_agp_binding *request) 353int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
354{ 354{
355 drm_agp_mem_t *entry; 355 drm_agp_mem_t *entry;
356 int retcode; 356 int retcode;
@@ -375,8 +375,8 @@ EXPORT_SYMBOL(drm_agp_bind);
375int drm_agp_bind_ioctl(struct inode *inode, struct file *filp, 375int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
376 unsigned int cmd, unsigned long arg) 376 unsigned int cmd, unsigned long arg)
377{ 377{
378 drm_file_t *priv = filp->private_data; 378 struct drm_file *priv = filp->private_data;
379 drm_device_t *dev = priv->head->dev; 379 struct drm_device *dev = priv->head->dev;
380 struct drm_agp_binding request; 380 struct drm_agp_binding request;
381 381
382 if (copy_from_user 382 if (copy_from_user
@@ -400,7 +400,7 @@ int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
400 * unbind_agp(). Frees it via free_agp() as well as the entry itself 400 * unbind_agp(). Frees it via free_agp() as well as the entry itself
401 * and unlinks from the doubly linked list it's inserted in. 401 * and unlinks from the doubly linked list it's inserted in.
402 */ 402 */
403int drm_agp_free(drm_device_t *dev, struct drm_agp_buffer *request) 403int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
404{ 404{
405 drm_agp_mem_t *entry; 405 drm_agp_mem_t *entry;
406 406
@@ -422,8 +422,8 @@ EXPORT_SYMBOL(drm_agp_free);
422int drm_agp_free_ioctl(struct inode *inode, struct file *filp, 422int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
423 unsigned int cmd, unsigned long arg) 423 unsigned int cmd, unsigned long arg)
424{ 424{
425 drm_file_t *priv = filp->private_data; 425 struct drm_file *priv = filp->private_data;
426 drm_device_t *dev = priv->head->dev; 426 struct drm_device *dev = priv->head->dev;
427 struct drm_agp_buffer request; 427 struct drm_agp_buffer request;
428 428
429 if (copy_from_user 429 if (copy_from_user
@@ -442,7 +442,7 @@ int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
442 * via the inter_module_* functions. Creates and initializes a drm_agp_head 442 * via the inter_module_* functions. Creates and initializes a drm_agp_head
443 * structure. 443 * structure.
444 */ 444 */
445drm_agp_head_t *drm_agp_init(drm_device_t * dev) 445drm_agp_head_t *drm_agp_init(struct drm_device *dev)
446{ 446{
447 drm_agp_head_t *head = NULL; 447 drm_agp_head_t *head = NULL;
448 448
diff --git a/drivers/char/drm/drm_auth.c b/drivers/char/drm/drm_auth.c
index 16e6f0e93b20..905b8bda700d 100644
--- a/drivers/char/drm/drm_auth.c
+++ b/drivers/char/drm/drm_auth.c
@@ -45,9 +45,9 @@
45 * the one with matching magic number, while holding the drm_device::struct_mutex 45 * the one with matching magic number, while holding the drm_device::struct_mutex
46 * lock. 46 * lock.
47 */ 47 */
48static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic) 48static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic)
49{ 49{
50 drm_file_t *retval = NULL; 50 struct drm_file *retval = NULL;
51 drm_magic_entry_t *pt; 51 drm_magic_entry_t *pt;
52 drm_hash_item_t *hash; 52 drm_hash_item_t *hash;
53 53
@@ -71,7 +71,7 @@ static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic)
71 * associated the magic number hash key in drm_device::magiclist, while holding 71 * associated the magic number hash key in drm_device::magiclist, while holding
72 * the drm_device::struct_mutex lock. 72 * the drm_device::struct_mutex lock.
73 */ 73 */
74static int drm_add_magic(drm_device_t * dev, drm_file_t * priv, 74static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,
75 drm_magic_t magic) 75 drm_magic_t magic)
76{ 76{
77 drm_magic_entry_t *entry; 77 drm_magic_entry_t *entry;
@@ -102,7 +102,7 @@ static int drm_add_magic(drm_device_t * dev, drm_file_t * priv,
102 * Searches and unlinks the entry in drm_device::magiclist with the magic 102 * Searches and unlinks the entry in drm_device::magiclist with the magic
103 * number hash key, while holding the drm_device::struct_mutex lock. 103 * number hash key, while holding the drm_device::struct_mutex lock.
104 */ 104 */
105static int drm_remove_magic(drm_device_t * dev, drm_magic_t magic) 105static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)
106{ 106{
107 drm_magic_entry_t *pt; 107 drm_magic_entry_t *pt;
108 drm_hash_item_t *hash; 108 drm_hash_item_t *hash;
@@ -142,8 +142,8 @@ int drm_getmagic(struct inode *inode, struct file *filp,
142{ 142{
143 static drm_magic_t sequence = 0; 143 static drm_magic_t sequence = 0;
144 static DEFINE_SPINLOCK(lock); 144 static DEFINE_SPINLOCK(lock);
145 drm_file_t *priv = filp->private_data; 145 struct drm_file *priv = filp->private_data;
146 drm_device_t *dev = priv->head->dev; 146 struct drm_device *dev = priv->head->dev;
147 struct drm_auth auth; 147 struct drm_auth auth;
148 148
149 /* Find unique magic */ 149 /* Find unique magic */
@@ -181,10 +181,10 @@ int drm_getmagic(struct inode *inode, struct file *filp,
181int drm_authmagic(struct inode *inode, struct file *filp, 181int drm_authmagic(struct inode *inode, struct file *filp,
182 unsigned int cmd, unsigned long arg) 182 unsigned int cmd, unsigned long arg)
183{ 183{
184 drm_file_t *priv = filp->private_data; 184 struct drm_file *priv = filp->private_data;
185 drm_device_t *dev = priv->head->dev; 185 struct drm_device *dev = priv->head->dev;
186 struct drm_auth auth; 186 struct drm_auth auth;
187 drm_file_t *file; 187 struct drm_file *file;
188 188
189 if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth))) 189 if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth)))
190 return -EFAULT; 190 return -EFAULT;
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 6678db2abd8e..d12e2876a2ab 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -36,20 +36,20 @@
36#include <linux/vmalloc.h> 36#include <linux/vmalloc.h>
37#include "drmP.h" 37#include "drmP.h"
38 38
39unsigned long drm_get_resource_start(drm_device_t *dev, unsigned int resource) 39unsigned long drm_get_resource_start(struct drm_device *dev, unsigned int resource)
40{ 40{
41 return pci_resource_start(dev->pdev, resource); 41 return pci_resource_start(dev->pdev, resource);
42} 42}
43EXPORT_SYMBOL(drm_get_resource_start); 43EXPORT_SYMBOL(drm_get_resource_start);
44 44
45unsigned long drm_get_resource_len(drm_device_t *dev, unsigned int resource) 45unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource)
46{ 46{
47 return pci_resource_len(dev->pdev, resource); 47 return pci_resource_len(dev->pdev, resource);
48} 48}
49 49
50EXPORT_SYMBOL(drm_get_resource_len); 50EXPORT_SYMBOL(drm_get_resource_len);
51 51
52static drm_map_list_t *drm_find_matching_map(drm_device_t *dev, 52static drm_map_list_t *drm_find_matching_map(struct drm_device *dev,
53 drm_local_map_t *map) 53 drm_local_map_t *map)
54{ 54{
55 drm_map_list_t *entry; 55 drm_map_list_t *entry;
@@ -64,7 +64,7 @@ static drm_map_list_t *drm_find_matching_map(drm_device_t *dev,
64 return NULL; 64 return NULL;
65} 65}
66 66
67static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, 67static int drm_map_handle(struct drm_device *dev, drm_hash_item_t *hash,
68 unsigned long user_token, int hashed_handle) 68 unsigned long user_token, int hashed_handle)
69{ 69{
70 int use_hashed_handle; 70 int use_hashed_handle;
@@ -101,7 +101,7 @@ static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
101 * type. Adds the map to the map list drm_device::maplist. Adds MTRR's where 101 * type. Adds the map to the map list drm_device::maplist. Adds MTRR's where
102 * applicable and if supported by the kernel. 102 * applicable and if supported by the kernel.
103 */ 103 */
104static int drm_addmap_core(drm_device_t * dev, unsigned int offset, 104static int drm_addmap_core(struct drm_device * dev, unsigned int offset,
105 unsigned int size, enum drm_map_type type, 105 unsigned int size, enum drm_map_type type,
106 enum drm_map_flags flags, drm_map_list_t ** maplist) 106 enum drm_map_flags flags, drm_map_list_t ** maplist)
107{ 107{
@@ -310,7 +310,7 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
310 return 0; 310 return 0;
311 } 311 }
312 312
313int drm_addmap(drm_device_t * dev, unsigned int offset, 313int drm_addmap(struct drm_device * dev, unsigned int offset,
314 unsigned int size, enum drm_map_type type, 314 unsigned int size, enum drm_map_type type,
315 enum drm_map_flags flags, drm_local_map_t ** map_ptr) 315 enum drm_map_flags flags, drm_local_map_t ** map_ptr)
316{ 316{
@@ -328,8 +328,8 @@ EXPORT_SYMBOL(drm_addmap);
328int drm_addmap_ioctl(struct inode *inode, struct file *filp, 328int drm_addmap_ioctl(struct inode *inode, struct file *filp,
329 unsigned int cmd, unsigned long arg) 329 unsigned int cmd, unsigned long arg)
330{ 330{
331 drm_file_t *priv = filp->private_data; 331 struct drm_file *priv = filp->private_data;
332 drm_device_t *dev = priv->head->dev; 332 struct drm_device *dev = priv->head->dev;
333 struct drm_map map; 333 struct drm_map map;
334 drm_map_list_t *maplist; 334 drm_map_list_t *maplist;
335 struct drm_map __user *argp = (void __user *)arg; 335 struct drm_map __user *argp = (void __user *)arg;
@@ -376,7 +376,7 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
376 * 376 *
377 * \sa drm_addmap 377 * \sa drm_addmap
378 */ 378 */
379int drm_rmmap_locked(drm_device_t *dev, drm_local_map_t *map) 379int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map)
380{ 380{
381 drm_map_list_t *r_list = NULL, *list_t; 381 drm_map_list_t *r_list = NULL, *list_t;
382 drm_dma_handle_t dmah; 382 drm_dma_handle_t dmah;
@@ -426,7 +426,7 @@ int drm_rmmap_locked(drm_device_t *dev, drm_local_map_t *map)
426 return 0; 426 return 0;
427} 427}
428 428
429int drm_rmmap(drm_device_t *dev, drm_local_map_t *map) 429int drm_rmmap(struct drm_device *dev, drm_local_map_t *map)
430{ 430{
431 int ret; 431 int ret;
432 432
@@ -449,8 +449,8 @@ int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)
449int drm_rmmap_ioctl(struct inode *inode, struct file *filp, 449int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
450 unsigned int cmd, unsigned long arg) 450 unsigned int cmd, unsigned long arg)
451{ 451{
452 drm_file_t *priv = filp->private_data; 452 struct drm_file *priv = filp->private_data;
453 drm_device_t *dev = priv->head->dev; 453 struct drm_device *dev = priv->head->dev;
454 struct drm_map request; 454 struct drm_map request;
455 drm_local_map_t *map = NULL; 455 drm_local_map_t *map = NULL;
456 drm_map_list_t *r_list; 456 drm_map_list_t *r_list;
@@ -504,7 +504,7 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
504 * 504 *
505 * Frees any pages and buffers associated with the given entry. 505 * Frees any pages and buffers associated with the given entry.
506 */ 506 */
507static void drm_cleanup_buf_error(drm_device_t * dev, drm_buf_entry_t * entry) 507static void drm_cleanup_buf_error(struct drm_device * dev, drm_buf_entry_t * entry)
508{ 508{
509 int i; 509 int i;
510 510
@@ -541,7 +541,7 @@ static void drm_cleanup_buf_error(drm_device_t * dev, drm_buf_entry_t * entry)
541/** 541/**
542 * Add AGP buffers for DMA transfers. 542 * Add AGP buffers for DMA transfers.
543 * 543 *
544 * \param dev drm_device_t to which the buffers are to be added. 544 * \param dev struct drm_device to which the buffers are to be added.
545 * \param request pointer to a struct drm_buf_desc describing the request. 545 * \param request pointer to a struct drm_buf_desc describing the request.
546 * \return zero on success or a negative number on failure. 546 * \return zero on success or a negative number on failure.
547 * 547 *
@@ -549,7 +549,7 @@ static void drm_cleanup_buf_error(drm_device_t * dev, drm_buf_entry_t * entry)
549 * reallocates the buffer list of the same size order to accommodate the new 549 * reallocates the buffer list of the same size order to accommodate the new
550 * buffers. 550 * buffers.
551 */ 551 */
552int drm_addbufs_agp(drm_device_t * dev, struct drm_buf_desc * request) 552int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
553{ 553{
554 drm_device_dma_t *dma = dev->dma; 554 drm_device_dma_t *dma = dev->dma;
555 drm_buf_entry_t *entry; 555 drm_buf_entry_t *entry;
@@ -719,7 +719,7 @@ int drm_addbufs_agp(drm_device_t * dev, struct drm_buf_desc * request)
719EXPORT_SYMBOL(drm_addbufs_agp); 719EXPORT_SYMBOL(drm_addbufs_agp);
720#endif /* __OS_HAS_AGP */ 720#endif /* __OS_HAS_AGP */
721 721
722int drm_addbufs_pci(drm_device_t * dev, struct drm_buf_desc * request) 722int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
723{ 723{
724 drm_device_dma_t *dma = dev->dma; 724 drm_device_dma_t *dma = dev->dma;
725 int count; 725 int count;
@@ -945,7 +945,7 @@ int drm_addbufs_pci(drm_device_t * dev, struct drm_buf_desc * request)
945} 945}
946EXPORT_SYMBOL(drm_addbufs_pci); 946EXPORT_SYMBOL(drm_addbufs_pci);
947 947
948static int drm_addbufs_sg(drm_device_t * dev, struct drm_buf_desc * request) 948static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request)
949{ 949{
950 drm_device_dma_t *dma = dev->dma; 950 drm_device_dma_t *dma = dev->dma;
951 drm_buf_entry_t *entry; 951 drm_buf_entry_t *entry;
@@ -1107,7 +1107,7 @@ static int drm_addbufs_sg(drm_device_t * dev, struct drm_buf_desc * request)
1107 return 0; 1107 return 0;
1108} 1108}
1109 1109
1110static int drm_addbufs_fb(drm_device_t * dev, struct drm_buf_desc * request) 1110static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request)
1111{ 1111{
1112 drm_device_dma_t *dma = dev->dma; 1112 drm_device_dma_t *dma = dev->dma;
1113 drm_buf_entry_t *entry; 1113 drm_buf_entry_t *entry;
@@ -1286,8 +1286,8 @@ int drm_addbufs(struct inode *inode, struct file *filp,
1286 unsigned int cmd, unsigned long arg) 1286 unsigned int cmd, unsigned long arg)
1287{ 1287{
1288 struct drm_buf_desc request; 1288 struct drm_buf_desc request;
1289 drm_file_t *priv = filp->private_data; 1289 struct drm_file *priv = filp->private_data;
1290 drm_device_t *dev = priv->head->dev; 1290 struct drm_device *dev = priv->head->dev;
1291 int ret; 1291 int ret;
1292 1292
1293 if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) 1293 if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
@@ -1337,8 +1337,8 @@ int drm_addbufs(struct inode *inode, struct file *filp,
1337int drm_infobufs(struct inode *inode, struct file *filp, 1337int drm_infobufs(struct inode *inode, struct file *filp,
1338 unsigned int cmd, unsigned long arg) 1338 unsigned int cmd, unsigned long arg)
1339{ 1339{
1340 drm_file_t *priv = filp->private_data; 1340 struct drm_file *priv = filp->private_data;
1341 drm_device_t *dev = priv->head->dev; 1341 struct drm_device *dev = priv->head->dev;
1342 drm_device_dma_t *dma = dev->dma; 1342 drm_device_dma_t *dma = dev->dma;
1343 struct drm_buf_info request; 1343 struct drm_buf_info request;
1344 struct drm_buf_info __user *argp = (void __user *)arg; 1344 struct drm_buf_info __user *argp = (void __user *)arg;
@@ -1425,8 +1425,8 @@ int drm_infobufs(struct inode *inode, struct file *filp,
1425int drm_markbufs(struct inode *inode, struct file *filp, 1425int drm_markbufs(struct inode *inode, struct file *filp,
1426 unsigned int cmd, unsigned long arg) 1426 unsigned int cmd, unsigned long arg)
1427{ 1427{
1428 drm_file_t *priv = filp->private_data; 1428 struct drm_file *priv = filp->private_data;
1429 drm_device_t *dev = priv->head->dev; 1429 struct drm_device *dev = priv->head->dev;
1430 drm_device_dma_t *dma = dev->dma; 1430 drm_device_dma_t *dma = dev->dma;
1431 struct drm_buf_desc request; 1431 struct drm_buf_desc request;
1432 int order; 1432 int order;
@@ -1475,8 +1475,8 @@ int drm_markbufs(struct inode *inode, struct file *filp,
1475int drm_freebufs(struct inode *inode, struct file *filp, 1475int drm_freebufs(struct inode *inode, struct file *filp,
1476 unsigned int cmd, unsigned long arg) 1476 unsigned int cmd, unsigned long arg)
1477{ 1477{
1478 drm_file_t *priv = filp->private_data; 1478 struct drm_file *priv = filp->private_data;
1479 drm_device_t *dev = priv->head->dev; 1479 struct drm_device *dev = priv->head->dev;
1480 drm_device_dma_t *dma = dev->dma; 1480 drm_device_dma_t *dma = dev->dma;
1481 struct drm_buf_free request; 1481 struct drm_buf_free request;
1482 int i; 1482 int i;
@@ -1531,8 +1531,8 @@ int drm_freebufs(struct inode *inode, struct file *filp,
1531int drm_mapbufs(struct inode *inode, struct file *filp, 1531int drm_mapbufs(struct inode *inode, struct file *filp,
1532 unsigned int cmd, unsigned long arg) 1532 unsigned int cmd, unsigned long arg)
1533{ 1533{
1534 drm_file_t *priv = filp->private_data; 1534 struct drm_file *priv = filp->private_data;
1535 drm_device_t *dev = priv->head->dev; 1535 struct drm_device *dev = priv->head->dev;
1536 drm_device_dma_t *dma = dev->dma; 1536 drm_device_dma_t *dma = dev->dma;
1537 struct drm_buf_map __user *argp = (void __user *)arg; 1537 struct drm_buf_map __user *argp = (void __user *)arg;
1538 int retcode = 0; 1538 int retcode = 0;
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index 283f8f2895cb..767103cae09a 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -56,7 +56,7 @@
56 * in drm_device::context_sareas, while holding the drm_device::struct_mutex 56 * in drm_device::context_sareas, while holding the drm_device::struct_mutex
57 * lock. 57 * lock.
58 */ 58 */
59void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle) 59void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
60{ 60{
61 if (ctx_handle < 0) 61 if (ctx_handle < 0)
62 goto failed; 62 goto failed;
@@ -85,7 +85,7 @@ void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle)
85 * drm_device::context_sareas to accommodate the new entry while holding the 85 * drm_device::context_sareas to accommodate the new entry while holding the
86 * drm_device::struct_mutex lock. 86 * drm_device::struct_mutex lock.
87 */ 87 */
88static int drm_ctxbitmap_next(drm_device_t * dev) 88static int drm_ctxbitmap_next(struct drm_device * dev)
89{ 89{
90 int bit; 90 int bit;
91 91
@@ -147,7 +147,7 @@ static int drm_ctxbitmap_next(drm_device_t * dev)
147 * Allocates and initialize drm_device::ctx_bitmap and drm_device::context_sareas, while holding 147 * Allocates and initialize drm_device::ctx_bitmap and drm_device::context_sareas, while holding
148 * the drm_device::struct_mutex lock. 148 * the drm_device::struct_mutex lock.
149 */ 149 */
150int drm_ctxbitmap_init(drm_device_t * dev) 150int drm_ctxbitmap_init(struct drm_device * dev)
151{ 151{
152 int i; 152 int i;
153 int temp; 153 int temp;
@@ -180,7 +180,7 @@ int drm_ctxbitmap_init(drm_device_t * dev)
180 * Frees drm_device::ctx_bitmap and drm_device::context_sareas, while holding 180 * Frees drm_device::ctx_bitmap and drm_device::context_sareas, while holding
181 * the drm_device::struct_mutex lock. 181 * the drm_device::struct_mutex lock.
182 */ 182 */
183void drm_ctxbitmap_cleanup(drm_device_t * dev) 183void drm_ctxbitmap_cleanup(struct drm_device * dev)
184{ 184{
185 mutex_lock(&dev->struct_mutex); 185 mutex_lock(&dev->struct_mutex);
186 if (dev->context_sareas) 186 if (dev->context_sareas)
@@ -212,8 +212,8 @@ void drm_ctxbitmap_cleanup(drm_device_t * dev)
212int drm_getsareactx(struct inode *inode, struct file *filp, 212int drm_getsareactx(struct inode *inode, struct file *filp,
213 unsigned int cmd, unsigned long arg) 213 unsigned int cmd, unsigned long arg)
214{ 214{
215 drm_file_t *priv = filp->private_data; 215 struct drm_file *priv = filp->private_data;
216 drm_device_t *dev = priv->head->dev; 216 struct drm_device *dev = priv->head->dev;
217 struct drm_ctx_priv_map __user *argp = (void __user *)arg; 217 struct drm_ctx_priv_map __user *argp = (void __user *)arg;
218 struct drm_ctx_priv_map request; 218 struct drm_ctx_priv_map request;
219 struct drm_map *map; 219 struct drm_map *map;
@@ -263,8 +263,8 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
263int drm_setsareactx(struct inode *inode, struct file *filp, 263int drm_setsareactx(struct inode *inode, struct file *filp,
264 unsigned int cmd, unsigned long arg) 264 unsigned int cmd, unsigned long arg)
265{ 265{
266 drm_file_t *priv = filp->private_data; 266 struct drm_file *priv = filp->private_data;
267 drm_device_t *dev = priv->head->dev; 267 struct drm_device *dev = priv->head->dev;
268 struct drm_ctx_priv_map request; 268 struct drm_ctx_priv_map request;
269 struct drm_map *map = NULL; 269 struct drm_map *map = NULL;
270 drm_map_list_t *r_list = NULL; 270 drm_map_list_t *r_list = NULL;
@@ -313,7 +313,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
313 * 313 *
314 * Attempt to set drm_device::context_flag. 314 * Attempt to set drm_device::context_flag.
315 */ 315 */
316static int drm_context_switch(drm_device_t * dev, int old, int new) 316static int drm_context_switch(struct drm_device * dev, int old, int new)
317{ 317{
318 if (test_and_set_bit(0, &dev->context_flag)) { 318 if (test_and_set_bit(0, &dev->context_flag)) {
319 DRM_ERROR("Reentering -- FIXME\n"); 319 DRM_ERROR("Reentering -- FIXME\n");
@@ -341,7 +341,7 @@ static int drm_context_switch(drm_device_t * dev, int old, int new)
341 * hardware lock is held, clears the drm_device::context_flag and wakes up 341 * hardware lock is held, clears the drm_device::context_flag and wakes up
342 * drm_device::context_wait. 342 * drm_device::context_wait.
343 */ 343 */
344static int drm_context_switch_complete(drm_device_t * dev, int new) 344static int drm_context_switch_complete(struct drm_device * dev, int new)
345{ 345{
346 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */ 346 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
347 dev->last_switch = jiffies; 347 dev->last_switch = jiffies;
@@ -408,8 +408,8 @@ int drm_resctx(struct inode *inode, struct file *filp,
408int drm_addctx(struct inode *inode, struct file *filp, 408int drm_addctx(struct inode *inode, struct file *filp,
409 unsigned int cmd, unsigned long arg) 409 unsigned int cmd, unsigned long arg)
410{ 410{
411 drm_file_t *priv = filp->private_data; 411 struct drm_file *priv = filp->private_data;
412 drm_device_t *dev = priv->head->dev; 412 struct drm_device *dev = priv->head->dev;
413 drm_ctx_list_t *ctx_entry; 413 drm_ctx_list_t *ctx_entry;
414 struct drm_ctx __user *argp = (void __user *)arg; 414 struct drm_ctx __user *argp = (void __user *)arg;
415 struct drm_ctx ctx; 415 struct drm_ctx ctx;
@@ -504,8 +504,8 @@ int drm_getctx(struct inode *inode, struct file *filp,
504int drm_switchctx(struct inode *inode, struct file *filp, 504int drm_switchctx(struct inode *inode, struct file *filp,
505 unsigned int cmd, unsigned long arg) 505 unsigned int cmd, unsigned long arg)
506{ 506{
507 drm_file_t *priv = filp->private_data; 507 struct drm_file *priv = filp->private_data;
508 drm_device_t *dev = priv->head->dev; 508 struct drm_device *dev = priv->head->dev;
509 struct drm_ctx ctx; 509 struct drm_ctx ctx;
510 510
511 if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx))) 511 if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx)))
@@ -529,8 +529,8 @@ int drm_switchctx(struct inode *inode, struct file *filp,
529int drm_newctx(struct inode *inode, struct file *filp, 529int drm_newctx(struct inode *inode, struct file *filp,
530 unsigned int cmd, unsigned long arg) 530 unsigned int cmd, unsigned long arg)
531{ 531{
532 drm_file_t *priv = filp->private_data; 532 struct drm_file *priv = filp->private_data;
533 drm_device_t *dev = priv->head->dev; 533 struct drm_device *dev = priv->head->dev;
534 struct drm_ctx ctx; 534 struct drm_ctx ctx;
535 535
536 if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx))) 536 if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx)))
@@ -556,8 +556,8 @@ int drm_newctx(struct inode *inode, struct file *filp,
556int drm_rmctx(struct inode *inode, struct file *filp, 556int drm_rmctx(struct inode *inode, struct file *filp,
557 unsigned int cmd, unsigned long arg) 557 unsigned int cmd, unsigned long arg)
558{ 558{
559 drm_file_t *priv = filp->private_data; 559 struct drm_file *priv = filp->private_data;
560 drm_device_t *dev = priv->head->dev; 560 struct drm_device *dev = priv->head->dev;
561 struct drm_ctx ctx; 561 struct drm_ctx ctx;
562 562
563 if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx))) 563 if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx)))
diff --git a/drivers/char/drm/drm_dma.c b/drivers/char/drm/drm_dma.c
index 32ed19c9ec1c..2cffb7b597fd 100644
--- a/drivers/char/drm/drm_dma.c
+++ b/drivers/char/drm/drm_dma.c
@@ -43,7 +43,7 @@
43 * 43 *
44 * Allocate and initialize a drm_device_dma structure. 44 * Allocate and initialize a drm_device_dma structure.
45 */ 45 */
46int drm_dma_setup(drm_device_t * dev) 46int drm_dma_setup(struct drm_device *dev)
47{ 47{
48 int i; 48 int i;
49 49
@@ -67,7 +67,7 @@ int drm_dma_setup(drm_device_t * dev)
67 * Free all pages associated with DMA buffers, the buffers and pages lists, and 67 * Free all pages associated with DMA buffers, the buffers and pages lists, and
68 * finally the drm_device::dma structure itself. 68 * finally the drm_device::dma structure itself.
69 */ 69 */
70void drm_dma_takedown(drm_device_t * dev) 70void drm_dma_takedown(struct drm_device *dev)
71{ 71{
72 drm_device_dma_t *dma = dev->dma; 72 drm_device_dma_t *dma = dev->dma;
73 int i, j; 73 int i, j;
@@ -129,7 +129,7 @@ void drm_dma_takedown(drm_device_t * dev)
129 * 129 *
130 * Resets the fields of \p buf. 130 * Resets the fields of \p buf.
131 */ 131 */
132void drm_free_buffer(drm_device_t * dev, drm_buf_t * buf) 132void drm_free_buffer(struct drm_device *dev, drm_buf_t * buf)
133{ 133{
134 if (!buf) 134 if (!buf)
135 return; 135 return;
@@ -152,7 +152,7 @@ void drm_free_buffer(drm_device_t * dev, drm_buf_t * buf)
152 * 152 *
153 * Frees each buffer associated with \p filp not already on the hardware. 153 * Frees each buffer associated with \p filp not already on the hardware.
154 */ 154 */
155void drm_core_reclaim_buffers(drm_device_t * dev, struct file *filp) 155void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp)
156{ 156{
157 drm_device_dma_t *dma = dev->dma; 157 drm_device_dma_t *dma = dev->dma;
158 int i; 158 int i;
diff --git a/drivers/char/drm/drm_drawable.c b/drivers/char/drm/drm_drawable.c
index 87dabd994618..309e585a5442 100644
--- a/drivers/char/drm/drm_drawable.c
+++ b/drivers/char/drm/drm_drawable.c
@@ -322,7 +322,7 @@ error:
322/** 322/**
323 * Caller must hold the drawable spinlock! 323 * Caller must hold the drawable spinlock!
324 */ 324 */
325struct drm_drawable_info *drm_get_drawable_info(drm_device_t *dev, drm_drawable_t id) { 325struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev, drm_drawable_t id) {
326 u32 *bitfield = dev->drw_bitfield; 326 u32 *bitfield = dev->drw_bitfield;
327 unsigned int idx, shift; 327 unsigned int idx, shift;
328 328
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index 4036c7cf7c05..6c7aae6c5b67 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -129,7 +129,7 @@ static drm_ioctl_desc_t drm_ioctls[] = {
129 * 129 *
130 * \sa drm_device 130 * \sa drm_device
131 */ 131 */
132int drm_lastclose(drm_device_t * dev) 132int drm_lastclose(struct drm_device * dev)
133{ 133{
134 drm_magic_entry_t *pt, *next; 134 drm_magic_entry_t *pt, *next;
135 drm_map_list_t *r_list, *list_t; 135 drm_map_list_t *r_list, *list_t;
@@ -290,7 +290,7 @@ EXPORT_SYMBOL(drm_init);
290 * 290 *
291 * \sa drm_init 291 * \sa drm_init
292 */ 292 */
293static void drm_cleanup(drm_device_t * dev) 293static void drm_cleanup(struct drm_device * dev)
294{ 294{
295 DRM_DEBUG("\n"); 295 DRM_DEBUG("\n");
296 296
@@ -330,8 +330,8 @@ static void drm_cleanup(drm_device_t * dev)
330void drm_exit(struct drm_driver *driver) 330void drm_exit(struct drm_driver *driver)
331{ 331{
332 int i; 332 int i;
333 drm_device_t *dev = NULL; 333 struct drm_device *dev = NULL;
334 drm_head_t *head; 334 struct drm_head *head;
335 335
336 DRM_DEBUG("\n"); 336 DRM_DEBUG("\n");
337 337
@@ -430,8 +430,8 @@ module_exit(drm_core_exit);
430static int drm_version(struct inode *inode, struct file *filp, 430static int drm_version(struct inode *inode, struct file *filp,
431 unsigned int cmd, unsigned long arg) 431 unsigned int cmd, unsigned long arg)
432{ 432{
433 drm_file_t *priv = filp->private_data; 433 struct drm_file *priv = filp->private_data;
434 drm_device_t *dev = priv->head->dev; 434 struct drm_device *dev = priv->head->dev;
435 struct drm_version __user *argp = (void __user *)arg; 435 struct drm_version __user *argp = (void __user *)arg;
436 struct drm_version version; 436 struct drm_version version;
437 int len; 437 int len;
@@ -466,8 +466,8 @@ static int drm_version(struct inode *inode, struct file *filp,
466int drm_ioctl(struct inode *inode, struct file *filp, 466int drm_ioctl(struct inode *inode, struct file *filp,
467 unsigned int cmd, unsigned long arg) 467 unsigned int cmd, unsigned long arg)
468{ 468{
469 drm_file_t *priv = filp->private_data; 469 struct drm_file *priv = filp->private_data;
470 drm_device_t *dev = priv->head->dev; 470 struct drm_device *dev = priv->head->dev;
471 drm_ioctl_desc_t *ioctl; 471 drm_ioctl_desc_t *ioctl;
472 drm_ioctl_t *func; 472 drm_ioctl_t *func;
473 unsigned int nr = DRM_IOCTL_NR(cmd); 473 unsigned int nr = DRM_IOCTL_NR(cmd);
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index d4b4dce68ad2..ef2a28af136f 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -39,9 +39,9 @@
39#include <linux/poll.h> 39#include <linux/poll.h>
40 40
41static int drm_open_helper(struct inode *inode, struct file *filp, 41static int drm_open_helper(struct inode *inode, struct file *filp,
42 drm_device_t * dev); 42 struct drm_device * dev);
43 43
44static int drm_setup(drm_device_t * dev) 44static int drm_setup(struct drm_device * dev)
45{ 45{
46 drm_local_map_t *map; 46 drm_local_map_t *map;
47 int i; 47 int i;
@@ -128,7 +128,7 @@ static int drm_setup(drm_device_t * dev)
128 */ 128 */
129int drm_open(struct inode *inode, struct file *filp) 129int drm_open(struct inode *inode, struct file *filp)
130{ 130{
131 drm_device_t *dev = NULL; 131 struct drm_device *dev = NULL;
132 int minor = iminor(inode); 132 int minor = iminor(inode);
133 int retcode = 0; 133 int retcode = 0;
134 134
@@ -167,7 +167,7 @@ EXPORT_SYMBOL(drm_open);
167 */ 167 */
168int drm_stub_open(struct inode *inode, struct file *filp) 168int drm_stub_open(struct inode *inode, struct file *filp)
169{ 169{
170 drm_device_t *dev = NULL; 170 struct drm_device *dev = NULL;
171 int minor = iminor(inode); 171 int minor = iminor(inode);
172 int err = -ENODEV; 172 int err = -ENODEV;
173 const struct file_operations *old_fops; 173 const struct file_operations *old_fops;
@@ -223,10 +223,10 @@ static int drm_cpu_valid(void)
223 * filp and add it into the double linked list in \p dev. 223 * filp and add it into the double linked list in \p dev.
224 */ 224 */
225static int drm_open_helper(struct inode *inode, struct file *filp, 225static int drm_open_helper(struct inode *inode, struct file *filp,
226 drm_device_t * dev) 226 struct drm_device * dev)
227{ 227{
228 int minor = iminor(inode); 228 int minor = iminor(inode);
229 drm_file_t *priv; 229 struct drm_file *priv;
230 int ret; 230 int ret;
231 231
232 if (filp->f_flags & O_EXCL) 232 if (filp->f_flags & O_EXCL)
@@ -295,8 +295,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
295/** No-op. */ 295/** No-op. */
296int drm_fasync(int fd, struct file *filp, int on) 296int drm_fasync(int fd, struct file *filp, int on)
297{ 297{
298 drm_file_t *priv = filp->private_data; 298 struct drm_file *priv = filp->private_data;
299 drm_device_t *dev = priv->head->dev; 299 struct drm_device *dev = priv->head->dev;
300 int retcode; 300 int retcode;
301 301
302 DRM_DEBUG("fd = %d, device = 0x%lx\n", fd, 302 DRM_DEBUG("fd = %d, device = 0x%lx\n", fd,
@@ -322,8 +322,8 @@ EXPORT_SYMBOL(drm_fasync);
322 */ 322 */
323int drm_release(struct inode *inode, struct file *filp) 323int drm_release(struct inode *inode, struct file *filp)
324{ 324{
325 drm_file_t *priv = filp->private_data; 325 struct drm_file *priv = filp->private_data;
326 drm_device_t *dev; 326 struct drm_device *dev;
327 int retcode = 0; 327 int retcode = 0;
328 328
329 lock_kernel(); 329 lock_kernel();
@@ -422,7 +422,7 @@ int drm_release(struct inode *inode, struct file *filp)
422 422
423 mutex_lock(&dev->struct_mutex); 423 mutex_lock(&dev->struct_mutex);
424 if (priv->remove_auth_on_close == 1) { 424 if (priv->remove_auth_on_close == 1) {
425 drm_file_t *temp; 425 struct drm_file *temp;
426 426
427 list_for_each_entry(temp, &dev->filelist, lhead) 427 list_for_each_entry(temp, &dev->filelist, lhead)
428 temp->authenticated = 0; 428 temp->authenticated = 0;
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
index afc355318f6a..94d7428b38d2 100644
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -52,8 +52,8 @@
52int drm_getunique(struct inode *inode, struct file *filp, 52int drm_getunique(struct inode *inode, struct file *filp,
53 unsigned int cmd, unsigned long arg) 53 unsigned int cmd, unsigned long arg)
54{ 54{
55 drm_file_t *priv = filp->private_data; 55 struct drm_file *priv = filp->private_data;
56 drm_device_t *dev = priv->head->dev; 56 struct drm_device *dev = priv->head->dev;
57 struct drm_unique __user *argp = (void __user *)arg; 57 struct drm_unique __user *argp = (void __user *)arg;
58 struct drm_unique u; 58 struct drm_unique u;
59 59
@@ -86,8 +86,8 @@ int drm_getunique(struct inode *inode, struct file *filp,
86int drm_setunique(struct inode *inode, struct file *filp, 86int drm_setunique(struct inode *inode, struct file *filp,
87 unsigned int cmd, unsigned long arg) 87 unsigned int cmd, unsigned long arg)
88{ 88{
89 drm_file_t *priv = filp->private_data; 89 struct drm_file *priv = filp->private_data;
90 drm_device_t *dev = priv->head->dev; 90 struct drm_device *dev = priv->head->dev;
91 struct drm_unique u; 91 struct drm_unique u;
92 int domain, bus, slot, func, ret; 92 int domain, bus, slot, func, ret;
93 93
@@ -136,7 +136,7 @@ int drm_setunique(struct inode *inode, struct file *filp,
136 return 0; 136 return 0;
137} 137}
138 138
139static int drm_set_busid(drm_device_t * dev) 139static int drm_set_busid(struct drm_device * dev)
140{ 140{
141 int len; 141 int len;
142 142
@@ -184,8 +184,8 @@ static int drm_set_busid(drm_device_t * dev)
184int drm_getmap(struct inode *inode, struct file *filp, 184int drm_getmap(struct inode *inode, struct file *filp,
185 unsigned int cmd, unsigned long arg) 185 unsigned int cmd, unsigned long arg)
186{ 186{
187 drm_file_t *priv = filp->private_data; 187 struct drm_file *priv = filp->private_data;
188 drm_device_t *dev = priv->head->dev; 188 struct drm_device *dev = priv->head->dev;
189 struct drm_map __user *argp = (void __user *)arg; 189 struct drm_map __user *argp = (void __user *)arg;
190 struct drm_map map; 190 struct drm_map map;
191 drm_map_list_t *r_list = NULL; 191 drm_map_list_t *r_list = NULL;
@@ -245,11 +245,11 @@ int drm_getmap(struct inode *inode, struct file *filp,
245int drm_getclient(struct inode *inode, struct file *filp, 245int drm_getclient(struct inode *inode, struct file *filp,
246 unsigned int cmd, unsigned long arg) 246 unsigned int cmd, unsigned long arg)
247{ 247{
248 drm_file_t *priv = filp->private_data; 248 struct drm_file *priv = filp->private_data;
249 drm_device_t *dev = priv->head->dev; 249 struct drm_device *dev = priv->head->dev;
250 struct drm_client __user *argp = (struct drm_client __user *)arg; 250 struct drm_client __user *argp = (struct drm_client __user *)arg;
251 struct drm_client client; 251 struct drm_client client;
252 drm_file_t *pt; 252 struct drm_file *pt;
253 int idx; 253 int idx;
254 int i; 254 int i;
255 255
@@ -294,8 +294,8 @@ int drm_getclient(struct inode *inode, struct file *filp,
294int drm_getstats(struct inode *inode, struct file *filp, 294int drm_getstats(struct inode *inode, struct file *filp,
295 unsigned int cmd, unsigned long arg) 295 unsigned int cmd, unsigned long arg)
296{ 296{
297 drm_file_t *priv = filp->private_data; 297 struct drm_file *priv = filp->private_data;
298 drm_device_t *dev = priv->head->dev; 298 struct drm_device *dev = priv->head->dev;
299 struct drm_stats stats; 299 struct drm_stats stats;
300 int i; 300 int i;
301 301
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index 6b2b3d626ced..bbdad83f6d8c 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -53,8 +53,8 @@
53int drm_irq_by_busid(struct inode *inode, struct file *filp, 53int drm_irq_by_busid(struct inode *inode, struct file *filp,
54 unsigned int cmd, unsigned long arg) 54 unsigned int cmd, unsigned long arg)
55{ 55{
56 drm_file_t *priv = filp->private_data; 56 struct drm_file *priv = filp->private_data;
57 drm_device_t *dev = priv->head->dev; 57 struct drm_device *dev = priv->head->dev;
58 struct drm_irq_busid __user *argp = (void __user *)arg; 58 struct drm_irq_busid __user *argp = (void __user *)arg;
59 struct drm_irq_busid p; 59 struct drm_irq_busid p;
60 60
@@ -87,7 +87,7 @@ int drm_irq_by_busid(struct inode *inode, struct file *filp,
87 * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions 87 * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions
88 * before and after the installation. 88 * before and after the installation.
89 */ 89 */
90static int drm_irq_install(drm_device_t * dev) 90static int drm_irq_install(struct drm_device * dev)
91{ 91{
92 int ret; 92 int ret;
93 unsigned long sh_flags = 0; 93 unsigned long sh_flags = 0;
@@ -155,7 +155,7 @@ static int drm_irq_install(drm_device_t * dev)
155 * 155 *
156 * Calls the driver's \c drm_driver_irq_uninstall() function, and stops the irq. 156 * Calls the driver's \c drm_driver_irq_uninstall() function, and stops the irq.
157 */ 157 */
158int drm_irq_uninstall(drm_device_t * dev) 158int drm_irq_uninstall(struct drm_device * dev)
159{ 159{
160 int irq_enabled; 160 int irq_enabled;
161 161
@@ -197,8 +197,8 @@ EXPORT_SYMBOL(drm_irq_uninstall);
197int drm_control(struct inode *inode, struct file *filp, 197int drm_control(struct inode *inode, struct file *filp,
198 unsigned int cmd, unsigned long arg) 198 unsigned int cmd, unsigned long arg)
199{ 199{
200 drm_file_t *priv = filp->private_data; 200 struct drm_file *priv = filp->private_data;
201 drm_device_t *dev = priv->head->dev; 201 struct drm_device *dev = priv->head->dev;
202 struct drm_control ctl; 202 struct drm_control ctl;
203 203
204 /* if we haven't irq we fallback for compatibility reasons - this used to be a separate function in drm_dma.h */ 204 /* if we haven't irq we fallback for compatibility reasons - this used to be a separate function in drm_dma.h */
@@ -244,8 +244,8 @@ int drm_control(struct inode *inode, struct file *filp,
244 */ 244 */
245int drm_wait_vblank(DRM_IOCTL_ARGS) 245int drm_wait_vblank(DRM_IOCTL_ARGS)
246{ 246{
247 drm_file_t *priv = filp->private_data; 247 struct drm_file *priv = filp->private_data;
248 drm_device_t *dev = priv->head->dev; 248 struct drm_device *dev = priv->head->dev;
249 union drm_wait_vblank __user *argp = (void __user *)data; 249 union drm_wait_vblank __user *argp = (void __user *)data;
250 union drm_wait_vblank vblwait; 250 union drm_wait_vblank vblwait;
251 struct timeval now; 251 struct timeval now;
@@ -371,7 +371,7 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
371 * 371 *
372 * If a signal is not requested, then calls vblank_wait(). 372 * If a signal is not requested, then calls vblank_wait().
373 */ 373 */
374void drm_vbl_send_signals(drm_device_t * dev) 374void drm_vbl_send_signals(struct drm_device * dev)
375{ 375{
376 unsigned long flags; 376 unsigned long flags;
377 int i; 377 int i;
@@ -416,7 +416,7 @@ EXPORT_SYMBOL(drm_vbl_send_signals);
416 */ 416 */
417static void drm_locked_tasklet_func(unsigned long data) 417static void drm_locked_tasklet_func(unsigned long data)
418{ 418{
419 drm_device_t *dev = (drm_device_t*)data; 419 struct drm_device *dev = (struct drm_device *)data;
420 unsigned long irqflags; 420 unsigned long irqflags;
421 421
422 spin_lock_irqsave(&dev->tasklet_lock, irqflags); 422 spin_lock_irqsave(&dev->tasklet_lock, irqflags);
@@ -453,7 +453,7 @@ static void drm_locked_tasklet_func(unsigned long data)
453 * context, it must not make any assumptions about this. Also, the HW lock will 453 * context, it must not make any assumptions about this. Also, the HW lock will
454 * be held with the kernel context or any client context. 454 * be held with the kernel context or any client context.
455 */ 455 */
456void drm_locked_tasklet(drm_device_t *dev, void (*func)(drm_device_t*)) 456void drm_locked_tasklet(struct drm_device *dev, void (*func)(struct drm_device *))
457{ 457{
458 unsigned long irqflags; 458 unsigned long irqflags;
459 static DECLARE_TASKLET(drm_tasklet, drm_locked_tasklet_func, 0); 459 static DECLARE_TASKLET(drm_tasklet, drm_locked_tasklet_func, 0);
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index 62f12e745249..c3a998704106 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -51,8 +51,8 @@ static int drm_notifier(void *priv);
51int drm_lock(struct inode *inode, struct file *filp, 51int drm_lock(struct inode *inode, struct file *filp,
52 unsigned int cmd, unsigned long arg) 52 unsigned int cmd, unsigned long arg)
53{ 53{
54 drm_file_t *priv = filp->private_data; 54 struct drm_file *priv = filp->private_data;
55 drm_device_t *dev = priv->head->dev; 55 struct drm_device *dev = priv->head->dev;
56 DECLARE_WAITQUEUE(entry, current); 56 DECLARE_WAITQUEUE(entry, current);
57 struct drm_lock lock; 57 struct drm_lock lock;
58 int ret = 0; 58 int ret = 0;
@@ -152,8 +152,8 @@ int drm_lock(struct inode *inode, struct file *filp,
152int drm_unlock(struct inode *inode, struct file *filp, 152int drm_unlock(struct inode *inode, struct file *filp,
153 unsigned int cmd, unsigned long arg) 153 unsigned int cmd, unsigned long arg)
154{ 154{
155 drm_file_t *priv = filp->private_data; 155 struct drm_file *priv = filp->private_data;
156 drm_device_t *dev = priv->head->dev; 156 struct drm_device *dev = priv->head->dev;
157 struct drm_lock lock; 157 struct drm_lock lock;
158 unsigned long irqflags; 158 unsigned long irqflags;
159 159
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c
index 0683334f16c9..93019901bd30 100644
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/char/drm/drm_memory.c
@@ -80,7 +80,7 @@ void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area)
80 80
81#if __OS_HAS_AGP 81#if __OS_HAS_AGP
82static void *agp_remap(unsigned long offset, unsigned long size, 82static void *agp_remap(unsigned long offset, unsigned long size,
83 drm_device_t * dev) 83 struct drm_device * dev)
84{ 84{
85 unsigned long *phys_addr_map, i, num_pages = 85 unsigned long *phys_addr_map, i, num_pages =
86 PAGE_ALIGN(size) / PAGE_SIZE; 86 PAGE_ALIGN(size) / PAGE_SIZE;
@@ -123,7 +123,7 @@ static void *agp_remap(unsigned long offset, unsigned long size,
123} 123}
124 124
125/** Wrapper around agp_allocate_memory() */ 125/** Wrapper around agp_allocate_memory() */
126DRM_AGP_MEM *drm_alloc_agp(drm_device_t * dev, int pages, u32 type) 126DRM_AGP_MEM *drm_alloc_agp(struct drm_device * dev, int pages, u32 type)
127{ 127{
128 return drm_agp_allocate_memory(dev->agp->bridge, pages, type); 128 return drm_agp_allocate_memory(dev->agp->bridge, pages, type);
129} 129}
@@ -148,7 +148,7 @@ int drm_unbind_agp(DRM_AGP_MEM * handle)
148 148
149#else /* __OS_HAS_AGP */ 149#else /* __OS_HAS_AGP */
150static inline void *agp_remap(unsigned long offset, unsigned long size, 150static inline void *agp_remap(unsigned long offset, unsigned long size,
151 drm_device_t * dev) 151 struct drm_device * dev)
152{ 152{
153 return NULL; 153 return NULL;
154} 154}
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h
index 24767aaa8ea5..0b8d3433386d 100644
--- a/drivers/char/drm/drm_os_linux.h
+++ b/drivers/char/drm/drm_os_linux.h
@@ -34,8 +34,8 @@
34/** Read/write memory barrier */ 34/** Read/write memory barrier */
35#define DRM_MEMORYBARRIER() mb() 35#define DRM_MEMORYBARRIER() mb()
36/** DRM device local declaration */ 36/** DRM device local declaration */
37#define DRM_DEVICE drm_file_t *priv = filp->private_data; \ 37#define DRM_DEVICE struct drm_file *priv = filp->private_data; \
38 drm_device_t *dev = priv->head->dev 38 struct drm_device *dev = priv->head->dev
39 39
40/** IRQ handler arguments and return type and values */ 40/** IRQ handler arguments and return type and values */
41#define DRM_IRQ_ARGS int irq, void *arg 41#define DRM_IRQ_ARGS int irq, void *arg
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c
index 86a0f1c22091..e292bb0eaca2 100644
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/char/drm/drm_pci.c
@@ -47,7 +47,7 @@
47/** 47/**
48 * \brief Allocate a PCI consistent memory block, for DMA. 48 * \brief Allocate a PCI consistent memory block, for DMA.
49 */ 49 */
50drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align, 50drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align,
51 dma_addr_t maxaddr) 51 dma_addr_t maxaddr)
52{ 52{
53 drm_dma_handle_t *dmah; 53 drm_dma_handle_t *dmah;
@@ -126,7 +126,7 @@ EXPORT_SYMBOL(drm_pci_alloc);
126 * 126 *
127 * This function is for internal use in the Linux-specific DRM core code. 127 * This function is for internal use in the Linux-specific DRM core code.
128 */ 128 */
129void __drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah) 129void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
130{ 130{
131#if 1 131#if 1
132 unsigned long addr; 132 unsigned long addr;
@@ -172,7 +172,7 @@ void __drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah)
172/** 172/**
173 * \brief Free a PCI consistent memory block 173 * \brief Free a PCI consistent memory block
174 */ 174 */
175void drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah) 175void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
176{ 176{
177 __drm_pci_free(dev, dmah); 177 __drm_pci_free(dev, dmah);
178 kfree(dmah); 178 kfree(dmah);
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 0bd935768ce2..383287449282 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -87,7 +87,7 @@ static struct drm_proc_list {
87 * "/proc/dri/%minor%/", and each entry in proc_list as 87 * "/proc/dri/%minor%/", and each entry in proc_list as
88 * "/proc/dri/%minor%/%name%". 88 * "/proc/dri/%minor%/%name%".
89 */ 89 */
90int drm_proc_init(drm_device_t * dev, int minor, 90int drm_proc_init(struct drm_device * dev, int minor,
91 struct proc_dir_entry *root, struct proc_dir_entry **dev_root) 91 struct proc_dir_entry *root, struct proc_dir_entry **dev_root)
92{ 92{
93 struct proc_dir_entry *ent; 93 struct proc_dir_entry *ent;
@@ -163,7 +163,7 @@ int drm_proc_cleanup(int minor, struct proc_dir_entry *root,
163static int drm_name_info(char *buf, char **start, off_t offset, int request, 163static int drm_name_info(char *buf, char **start, off_t offset, int request,
164 int *eof, void *data) 164 int *eof, void *data)
165{ 165{
166 drm_device_t *dev = (drm_device_t *) data; 166 struct drm_device *dev = (struct drm_device *) data;
167 int len = 0; 167 int len = 0;
168 168
169 if (offset > DRM_PROC_LIMIT) { 169 if (offset > DRM_PROC_LIMIT) {
@@ -205,7 +205,7 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request,
205static int drm__vm_info(char *buf, char **start, off_t offset, int request, 205static int drm__vm_info(char *buf, char **start, off_t offset, int request,
206 int *eof, void *data) 206 int *eof, void *data)
207{ 207{
208 drm_device_t *dev = (drm_device_t *) data; 208 struct drm_device *dev = (struct drm_device *) data;
209 int len = 0; 209 int len = 0;
210 struct drm_map *map; 210 struct drm_map *map;
211 drm_map_list_t *r_list; 211 drm_map_list_t *r_list;
@@ -261,7 +261,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
261static int drm_vm_info(char *buf, char **start, off_t offset, int request, 261static int drm_vm_info(char *buf, char **start, off_t offset, int request,
262 int *eof, void *data) 262 int *eof, void *data)
263{ 263{
264 drm_device_t *dev = (drm_device_t *) data; 264 struct drm_device *dev = (struct drm_device *) data;
265 int ret; 265 int ret;
266 266
267 mutex_lock(&dev->struct_mutex); 267 mutex_lock(&dev->struct_mutex);
@@ -284,7 +284,7 @@ static int drm_vm_info(char *buf, char **start, off_t offset, int request,
284static int drm__queues_info(char *buf, char **start, off_t offset, 284static int drm__queues_info(char *buf, char **start, off_t offset,
285 int request, int *eof, void *data) 285 int request, int *eof, void *data)
286{ 286{
287 drm_device_t *dev = (drm_device_t *) data; 287 struct drm_device *dev = (struct drm_device *) data;
288 int len = 0; 288 int len = 0;
289 int i; 289 int i;
290 drm_queue_t *q; 290 drm_queue_t *q;
@@ -334,7 +334,7 @@ static int drm__queues_info(char *buf, char **start, off_t offset,
334static int drm_queues_info(char *buf, char **start, off_t offset, int request, 334static int drm_queues_info(char *buf, char **start, off_t offset, int request,
335 int *eof, void *data) 335 int *eof, void *data)
336{ 336{
337 drm_device_t *dev = (drm_device_t *) data; 337 struct drm_device *dev = (struct drm_device *) data;
338 int ret; 338 int ret;
339 339
340 mutex_lock(&dev->struct_mutex); 340 mutex_lock(&dev->struct_mutex);
@@ -357,7 +357,7 @@ static int drm_queues_info(char *buf, char **start, off_t offset, int request,
357static int drm__bufs_info(char *buf, char **start, off_t offset, int request, 357static int drm__bufs_info(char *buf, char **start, off_t offset, int request,
358 int *eof, void *data) 358 int *eof, void *data)
359{ 359{
360 drm_device_t *dev = (drm_device_t *) data; 360 struct drm_device *dev = (struct drm_device *) data;
361 int len = 0; 361 int len = 0;
362 drm_device_dma_t *dma = dev->dma; 362 drm_device_dma_t *dma = dev->dma;
363 int i; 363 int i;
@@ -406,7 +406,7 @@ static int drm__bufs_info(char *buf, char **start, off_t offset, int request,
406static int drm_bufs_info(char *buf, char **start, off_t offset, int request, 406static int drm_bufs_info(char *buf, char **start, off_t offset, int request,
407 int *eof, void *data) 407 int *eof, void *data)
408{ 408{
409 drm_device_t *dev = (drm_device_t *) data; 409 struct drm_device *dev = (struct drm_device *) data;
410 int ret; 410 int ret;
411 411
412 mutex_lock(&dev->struct_mutex); 412 mutex_lock(&dev->struct_mutex);
@@ -429,9 +429,9 @@ static int drm_bufs_info(char *buf, char **start, off_t offset, int request,
429static int drm__clients_info(char *buf, char **start, off_t offset, 429static int drm__clients_info(char *buf, char **start, off_t offset,
430 int request, int *eof, void *data) 430 int request, int *eof, void *data)
431{ 431{
432 drm_device_t *dev = (drm_device_t *) data; 432 struct drm_device *dev = (struct drm_device *) data;
433 int len = 0; 433 int len = 0;
434 drm_file_t *priv; 434 struct drm_file *priv;
435 435
436 if (offset > DRM_PROC_LIMIT) { 436 if (offset > DRM_PROC_LIMIT) {
437 *eof = 1; 437 *eof = 1;
@@ -462,7 +462,7 @@ static int drm__clients_info(char *buf, char **start, off_t offset,
462static int drm_clients_info(char *buf, char **start, off_t offset, 462static int drm_clients_info(char *buf, char **start, off_t offset,
463 int request, int *eof, void *data) 463 int request, int *eof, void *data)
464{ 464{
465 drm_device_t *dev = (drm_device_t *) data; 465 struct drm_device *dev = (struct drm_device *) data;
466 int ret; 466 int ret;
467 467
468 mutex_lock(&dev->struct_mutex); 468 mutex_lock(&dev->struct_mutex);
@@ -476,7 +476,7 @@ static int drm_clients_info(char *buf, char **start, off_t offset,
476static int drm__vma_info(char *buf, char **start, off_t offset, int request, 476static int drm__vma_info(char *buf, char **start, off_t offset, int request,
477 int *eof, void *data) 477 int *eof, void *data)
478{ 478{
479 drm_device_t *dev = (drm_device_t *) data; 479 struct drm_device *dev = (struct drm_device *) data;
480 int len = 0; 480 int len = 0;
481 drm_vma_entry_t *pt; 481 drm_vma_entry_t *pt;
482 struct vm_area_struct *vma; 482 struct vm_area_struct *vma;
@@ -535,7 +535,7 @@ static int drm__vma_info(char *buf, char **start, off_t offset, int request,
535static int drm_vma_info(char *buf, char **start, off_t offset, int request, 535static int drm_vma_info(char *buf, char **start, off_t offset, int request,
536 int *eof, void *data) 536 int *eof, void *data)
537{ 537{
538 drm_device_t *dev = (drm_device_t *) data; 538 struct drm_device *dev = (struct drm_device *) data;
539 int ret; 539 int ret;
540 540
541 mutex_lock(&dev->struct_mutex); 541 mutex_lock(&dev->struct_mutex);
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index 6d8947a274ef..058495631907 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -65,8 +65,8 @@ void drm_sg_cleanup(drm_sg_mem_t * entry)
65int drm_sg_alloc(struct inode *inode, struct file *filp, 65int drm_sg_alloc(struct inode *inode, struct file *filp,
66 unsigned int cmd, unsigned long arg) 66 unsigned int cmd, unsigned long arg)
67{ 67{
68 drm_file_t *priv = filp->private_data; 68 struct drm_file *priv = filp->private_data;
69 drm_device_t *dev = priv->head->dev; 69 struct drm_device *dev = priv->head->dev;
70 struct drm_scatter_gather __user *argp = (void __user *)arg; 70 struct drm_scatter_gather __user *argp = (void __user *)arg;
71 struct drm_scatter_gather request; 71 struct drm_scatter_gather request;
72 drm_sg_mem_t *entry; 72 drm_sg_mem_t *entry;
@@ -201,8 +201,8 @@ int drm_sg_alloc(struct inode *inode, struct file *filp,
201int drm_sg_free(struct inode *inode, struct file *filp, 201int drm_sg_free(struct inode *inode, struct file *filp,
202 unsigned int cmd, unsigned long arg) 202 unsigned int cmd, unsigned long arg)
203{ 203{
204 drm_file_t *priv = filp->private_data; 204 struct drm_file *priv = filp->private_data;
205 drm_device_t *dev = priv->head->dev; 205 struct drm_device *dev = priv->head->dev;
206 struct drm_scatter_gather request; 206 struct drm_scatter_gather request;
207 drm_sg_mem_t *entry; 207 drm_sg_mem_t *entry;
208 208
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 331163001963..9138b49e676e 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -49,11 +49,11 @@ MODULE_PARM_DESC(debug, "Enable debug output");
49module_param_named(cards_limit, drm_cards_limit, int, 0444); 49module_param_named(cards_limit, drm_cards_limit, int, 0444);
50module_param_named(debug, drm_debug, int, 0600); 50module_param_named(debug, drm_debug, int, 0600);
51 51
52drm_head_t **drm_heads; 52struct drm_head **drm_heads;
53struct class *drm_class; 53struct class *drm_class;
54struct proc_dir_entry *drm_proc_root; 54struct proc_dir_entry *drm_proc_root;
55 55
56static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, 56static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
57 const struct pci_device_id *ent, 57 const struct pci_device_id *ent,
58 struct drm_driver *driver) 58 struct drm_driver *driver)
59{ 59{
@@ -143,9 +143,9 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
143 * create the proc init entry via proc_init(). This routines assigns 143 * create the proc init entry via proc_init(). This routines assigns
144 * minor numbers to secondary heads of multi-headed cards 144 * minor numbers to secondary heads of multi-headed cards
145 */ 145 */
146static int drm_get_head(drm_device_t * dev, drm_head_t * head) 146static int drm_get_head(struct drm_device * dev, struct drm_head * head)
147{ 147{
148 drm_head_t **heads = drm_heads; 148 struct drm_head **heads = drm_heads;
149 int ret; 149 int ret;
150 int minor; 150 int minor;
151 151
@@ -154,7 +154,7 @@ static int drm_get_head(drm_device_t * dev, drm_head_t * head)
154 for (minor = 0; minor < drm_cards_limit; minor++, heads++) { 154 for (minor = 0; minor < drm_cards_limit; minor++, heads++) {
155 if (!*heads) { 155 if (!*heads) {
156 156
157 *head = (drm_head_t) { 157 *head = (struct drm_head) {
158 .dev = dev,.device = 158 .dev = dev,.device =
159 MKDEV(DRM_MAJOR, minor),.minor = minor,}; 159 MKDEV(DRM_MAJOR, minor),.minor = minor,};
160 160
@@ -184,7 +184,7 @@ static int drm_get_head(drm_device_t * dev, drm_head_t * head)
184 err_g2: 184 err_g2:
185 drm_proc_cleanup(minor, drm_proc_root, head->dev_root); 185 drm_proc_cleanup(minor, drm_proc_root, head->dev_root);
186 err_g1: 186 err_g1:
187 *head = (drm_head_t) { 187 *head = (struct drm_head) {
188 .dev = NULL}; 188 .dev = NULL};
189 return ret; 189 return ret;
190} 190}
@@ -203,7 +203,7 @@ static int drm_get_head(drm_device_t * dev, drm_head_t * head)
203int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 203int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
204 struct drm_driver *driver) 204 struct drm_driver *driver)
205{ 205{
206 drm_device_t *dev; 206 struct drm_device *dev;
207 int ret; 207 int ret;
208 208
209 DRM_DEBUG("\n"); 209 DRM_DEBUG("\n");
@@ -246,7 +246,7 @@ err_g1:
246 * "drm" data, otherwise unregisters the "drm" data, frees the dev list and 246 * "drm" data, otherwise unregisters the "drm" data, frees the dev list and
247 * unregisters the character device. 247 * unregisters the character device.
248 */ 248 */
249int drm_put_dev(drm_device_t * dev) 249int drm_put_dev(struct drm_device * dev)
250{ 250{
251 DRM_DEBUG("release primary %s\n", dev->driver->pci_driver.name); 251 DRM_DEBUG("release primary %s\n", dev->driver->pci_driver.name);
252 252
@@ -274,7 +274,7 @@ int drm_put_dev(drm_device_t * dev)
274 * last minor released. 274 * last minor released.
275 * 275 *
276 */ 276 */
277int drm_put_head(drm_head_t * head) 277int drm_put_head(struct drm_head * head)
278{ 278{
279 int minor = head->minor; 279 int minor = head->minor;
280 280
@@ -283,7 +283,7 @@ int drm_put_head(drm_head_t * head)
283 drm_proc_cleanup(minor, drm_proc_root, head->dev_root); 283 drm_proc_cleanup(minor, drm_proc_root, head->dev_root);
284 drm_sysfs_device_remove(head->dev_class); 284 drm_sysfs_device_remove(head->dev_class);
285 285
286 *head = (drm_head_t) {.dev = NULL}; 286 *head = (struct drm_head) {.dev = NULL};
287 287
288 drm_heads[minor] = NULL; 288 drm_heads[minor] = NULL;
289 289
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index cc8e2ebe128c..cf4349b00b07 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -80,7 +80,7 @@ void drm_sysfs_destroy(struct class *class)
80 80
81static ssize_t show_dri(struct class_device *class_device, char *buf) 81static ssize_t show_dri(struct class_device *class_device, char *buf)
82{ 82{
83 drm_device_t * dev = ((drm_head_t *)class_get_devdata(class_device))->dev; 83 struct drm_device * dev = ((struct drm_head *)class_get_devdata(class_device))->dev;
84 if (dev->driver->dri_library_name) 84 if (dev->driver->dri_library_name)
85 return dev->driver->dri_library_name(dev, buf); 85 return dev->driver->dri_library_name(dev, buf);
86 return snprintf(buf, PAGE_SIZE, "%s\n", dev->driver->pci_driver.name); 86 return snprintf(buf, PAGE_SIZE, "%s\n", dev->driver->pci_driver.name);
@@ -104,7 +104,7 @@ static struct class_device_attribute class_device_attrs[] = {
104 * Note: the struct class passed to this function must have previously been 104 * Note: the struct class passed to this function must have previously been
105 * created with a call to drm_sysfs_create(). 105 * created with a call to drm_sysfs_create().
106 */ 106 */
107struct class_device *drm_sysfs_device_add(struct class *cs, drm_head_t *head) 107struct class_device *drm_sysfs_device_add(struct class *cs, struct drm_head *head)
108{ 108{
109 struct class_device *class_dev; 109 struct class_device *class_dev;
110 int i, j, err; 110 int i, j, err;
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 13bdb1393c36..f90ef788eed0 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -79,8 +79,8 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
79static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma, 79static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
80 unsigned long address) 80 unsigned long address)
81{ 81{
82 drm_file_t *priv = vma->vm_file->private_data; 82 struct drm_file *priv = vma->vm_file->private_data;
83 drm_device_t *dev = priv->head->dev; 83 struct drm_device *dev = priv->head->dev;
84 struct drm_map *map = NULL; 84 struct drm_map *map = NULL;
85 drm_map_list_t *r_list; 85 drm_map_list_t *r_list;
86 drm_hash_item_t *hash; 86 drm_hash_item_t *hash;
@@ -194,8 +194,8 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
194 */ 194 */
195static void drm_vm_shm_close(struct vm_area_struct *vma) 195static void drm_vm_shm_close(struct vm_area_struct *vma)
196{ 196{
197 drm_file_t *priv = vma->vm_file->private_data; 197 struct drm_file *priv = vma->vm_file->private_data;
198 drm_device_t *dev = priv->head->dev; 198 struct drm_device *dev = priv->head->dev;
199 drm_vma_entry_t *pt, *temp; 199 drm_vma_entry_t *pt, *temp;
200 struct drm_map *map; 200 struct drm_map *map;
201 drm_map_list_t *r_list; 201 drm_map_list_t *r_list;
@@ -274,8 +274,8 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
274static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma, 274static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
275 unsigned long address) 275 unsigned long address)
276{ 276{
277 drm_file_t *priv = vma->vm_file->private_data; 277 struct drm_file *priv = vma->vm_file->private_data;
278 drm_device_t *dev = priv->head->dev; 278 struct drm_device *dev = priv->head->dev;
279 drm_device_dma_t *dma = dev->dma; 279 drm_device_dma_t *dma = dev->dma;
280 unsigned long offset; 280 unsigned long offset;
281 unsigned long page_nr; 281 unsigned long page_nr;
@@ -311,8 +311,8 @@ static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
311 unsigned long address) 311 unsigned long address)
312{ 312{
313 struct drm_map *map = (struct drm_map *) vma->vm_private_data; 313 struct drm_map *map = (struct drm_map *) vma->vm_private_data;
314 drm_file_t *priv = vma->vm_file->private_data; 314 struct drm_file *priv = vma->vm_file->private_data;
315 drm_device_t *dev = priv->head->dev; 315 struct drm_device *dev = priv->head->dev;
316 drm_sg_mem_t *entry = dev->sg; 316 drm_sg_mem_t *entry = dev->sg;
317 unsigned long offset; 317 unsigned long offset;
318 unsigned long map_offset; 318 unsigned long map_offset;
@@ -405,8 +405,8 @@ static struct vm_operations_struct drm_vm_sg_ops = {
405 */ 405 */
406static void drm_vm_open_locked(struct vm_area_struct *vma) 406static void drm_vm_open_locked(struct vm_area_struct *vma)
407{ 407{
408 drm_file_t *priv = vma->vm_file->private_data; 408 struct drm_file *priv = vma->vm_file->private_data;
409 drm_device_t *dev = priv->head->dev; 409 struct drm_device *dev = priv->head->dev;
410 drm_vma_entry_t *vma_entry; 410 drm_vma_entry_t *vma_entry;
411 411
412 DRM_DEBUG("0x%08lx,0x%08lx\n", 412 DRM_DEBUG("0x%08lx,0x%08lx\n",
@@ -423,8 +423,8 @@ static void drm_vm_open_locked(struct vm_area_struct *vma)
423 423
424static void drm_vm_open(struct vm_area_struct *vma) 424static void drm_vm_open(struct vm_area_struct *vma)
425{ 425{
426 drm_file_t *priv = vma->vm_file->private_data; 426 struct drm_file *priv = vma->vm_file->private_data;
427 drm_device_t *dev = priv->head->dev; 427 struct drm_device *dev = priv->head->dev;
428 428
429 mutex_lock(&dev->struct_mutex); 429 mutex_lock(&dev->struct_mutex);
430 drm_vm_open_locked(vma); 430 drm_vm_open_locked(vma);
@@ -441,8 +441,8 @@ static void drm_vm_open(struct vm_area_struct *vma)
441 */ 441 */
442static void drm_vm_close(struct vm_area_struct *vma) 442static void drm_vm_close(struct vm_area_struct *vma)
443{ 443{
444 drm_file_t *priv = vma->vm_file->private_data; 444 struct drm_file *priv = vma->vm_file->private_data;
445 drm_device_t *dev = priv->head->dev; 445 struct drm_device *dev = priv->head->dev;
446 drm_vma_entry_t *pt, *temp; 446 drm_vma_entry_t *pt, *temp;
447 447
448 DRM_DEBUG("0x%08lx,0x%08lx\n", 448 DRM_DEBUG("0x%08lx,0x%08lx\n",
@@ -472,8 +472,8 @@ static void drm_vm_close(struct vm_area_struct *vma)
472 */ 472 */
473static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) 473static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
474{ 474{
475 drm_file_t *priv = filp->private_data; 475 struct drm_file *priv = filp->private_data;
476 drm_device_t *dev; 476 struct drm_device *dev;
477 drm_device_dma_t *dma; 477 drm_device_dma_t *dma;
478 unsigned long length = vma->vm_end - vma->vm_start; 478 unsigned long length = vma->vm_end - vma->vm_start;
479 479
@@ -545,8 +545,8 @@ EXPORT_SYMBOL(drm_core_get_reg_ofs);
545 */ 545 */
546static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) 546static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
547{ 547{
548 drm_file_t *priv = filp->private_data; 548 struct drm_file *priv = filp->private_data;
549 drm_device_t *dev = priv->head->dev; 549 struct drm_device *dev = priv->head->dev;
550 struct drm_map *map = NULL; 550 struct drm_map *map = NULL;
551 unsigned long offset = 0; 551 unsigned long offset = 0;
552 drm_hash_item_t *hash; 552 drm_hash_item_t *hash;
@@ -663,8 +663,8 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
663 663
664int drm_mmap(struct file *filp, struct vm_area_struct *vma) 664int drm_mmap(struct file *filp, struct vm_area_struct *vma)
665{ 665{
666 drm_file_t *priv = filp->private_data; 666 struct drm_file *priv = filp->private_data;
667 drm_device_t *dev = priv->head->dev; 667 struct drm_device *dev = priv->head->dev;
668 int ret; 668 int ret;
669 669
670 mutex_lock(&dev->struct_mutex); 670 mutex_lock(&dev->struct_mutex);
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 977c74857383..3359cc2b9736 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -47,7 +47,7 @@
47 * the head pointer changes, so that EBUSY only happens if the ring 47 * the head pointer changes, so that EBUSY only happens if the ring
48 * actually stalls for (eg) 3 seconds. 48 * actually stalls for (eg) 3 seconds.
49 */ 49 */
50int i915_wait_ring(drm_device_t * dev, int n, const char *caller) 50int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
51{ 51{
52 drm_i915_private_t *dev_priv = dev->dev_private; 52 drm_i915_private_t *dev_priv = dev->dev_private;
53 drm_i915_ring_buffer_t *ring = &(dev_priv->ring); 53 drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
@@ -73,7 +73,7 @@ int i915_wait_ring(drm_device_t * dev, int n, const char *caller)
73 return DRM_ERR(EBUSY); 73 return DRM_ERR(EBUSY);
74} 74}
75 75
76void i915_kernel_lost_context(drm_device_t * dev) 76void i915_kernel_lost_context(struct drm_device * dev)
77{ 77{
78 drm_i915_private_t *dev_priv = dev->dev_private; 78 drm_i915_private_t *dev_priv = dev->dev_private;
79 drm_i915_ring_buffer_t *ring = &(dev_priv->ring); 79 drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
@@ -88,7 +88,7 @@ void i915_kernel_lost_context(drm_device_t * dev)
88 dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; 88 dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY;
89} 89}
90 90
91static int i915_dma_cleanup(drm_device_t * dev) 91static int i915_dma_cleanup(struct drm_device * dev)
92{ 92{
93 /* Make sure interrupts are disabled here because the uninstall ioctl 93 /* Make sure interrupts are disabled here because the uninstall ioctl
94 * may not have been called from userspace and after dev_private 94 * may not have been called from userspace and after dev_private
@@ -126,7 +126,7 @@ static int i915_dma_cleanup(drm_device_t * dev)
126 return 0; 126 return 0;
127} 127}
128 128
129static int i915_initialize(drm_device_t * dev, 129static int i915_initialize(struct drm_device * dev,
130 drm_i915_private_t * dev_priv, 130 drm_i915_private_t * dev_priv,
131 drm_i915_init_t * init) 131 drm_i915_init_t * init)
132{ 132{
@@ -211,7 +211,7 @@ static int i915_initialize(drm_device_t * dev,
211 return 0; 211 return 0;
212} 212}
213 213
214static int i915_dma_resume(drm_device_t * dev) 214static int i915_dma_resume(struct drm_device * dev)
215{ 215{
216 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 216 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
217 217
@@ -357,7 +357,7 @@ static int validate_cmd(int cmd)
357 return ret; 357 return ret;
358} 358}
359 359
360static int i915_emit_cmds(drm_device_t * dev, int __user * buffer, int dwords) 360static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwords)
361{ 361{
362 drm_i915_private_t *dev_priv = dev->dev_private; 362 drm_i915_private_t *dev_priv = dev->dev_private;
363 int i; 363 int i;
@@ -396,7 +396,7 @@ static int i915_emit_cmds(drm_device_t * dev, int __user * buffer, int dwords)
396 return 0; 396 return 0;
397} 397}
398 398
399static int i915_emit_box(drm_device_t * dev, 399static int i915_emit_box(struct drm_device * dev,
400 struct drm_clip_rect __user * boxes, 400 struct drm_clip_rect __user * boxes,
401 int i, int DR1, int DR4) 401 int i, int DR1, int DR4)
402{ 402{
@@ -439,7 +439,7 @@ static int i915_emit_box(drm_device_t * dev,
439 * emit. For now, do it in both places: 439 * emit. For now, do it in both places:
440 */ 440 */
441 441
442static void i915_emit_breadcrumb(drm_device_t *dev) 442static void i915_emit_breadcrumb(struct drm_device *dev)
443{ 443{
444 drm_i915_private_t *dev_priv = dev->dev_private; 444 drm_i915_private_t *dev_priv = dev->dev_private;
445 RING_LOCALS; 445 RING_LOCALS;
@@ -457,7 +457,7 @@ static void i915_emit_breadcrumb(drm_device_t *dev)
457 ADVANCE_LP_RING(); 457 ADVANCE_LP_RING();
458} 458}
459 459
460static int i915_dispatch_cmdbuffer(drm_device_t * dev, 460static int i915_dispatch_cmdbuffer(struct drm_device * dev,
461 drm_i915_cmdbuffer_t * cmd) 461 drm_i915_cmdbuffer_t * cmd)
462{ 462{
463 int nbox = cmd->num_cliprects; 463 int nbox = cmd->num_cliprects;
@@ -489,7 +489,7 @@ static int i915_dispatch_cmdbuffer(drm_device_t * dev,
489 return 0; 489 return 0;
490} 490}
491 491
492static int i915_dispatch_batchbuffer(drm_device_t * dev, 492static int i915_dispatch_batchbuffer(struct drm_device * dev,
493 drm_i915_batchbuffer_t * batch) 493 drm_i915_batchbuffer_t * batch)
494{ 494{
495 drm_i915_private_t *dev_priv = dev->dev_private; 495 drm_i915_private_t *dev_priv = dev->dev_private;
@@ -535,7 +535,7 @@ static int i915_dispatch_batchbuffer(drm_device_t * dev,
535 return 0; 535 return 0;
536} 536}
537 537
538static int i915_dispatch_flip(drm_device_t * dev) 538static int i915_dispatch_flip(struct drm_device * dev)
539{ 539{
540 drm_i915_private_t *dev_priv = dev->dev_private; 540 drm_i915_private_t *dev_priv = dev->dev_private;
541 RING_LOCALS; 541 RING_LOCALS;
@@ -583,7 +583,7 @@ static int i915_dispatch_flip(drm_device_t * dev)
583 return 0; 583 return 0;
584} 584}
585 585
586static int i915_quiescent(drm_device_t * dev) 586static int i915_quiescent(struct drm_device * dev)
587{ 587{
588 drm_i915_private_t *dev_priv = dev->dev_private; 588 drm_i915_private_t *dev_priv = dev->dev_private;
589 589
@@ -792,7 +792,7 @@ static int i915_set_status_page(DRM_IOCTL_ARGS)
792 return 0; 792 return 0;
793} 793}
794 794
795int i915_driver_load(drm_device_t *dev, unsigned long flags) 795int i915_driver_load(struct drm_device *dev, unsigned long flags)
796{ 796{
797 /* i915 has 4 more counters */ 797 /* i915 has 4 more counters */
798 dev->counters += 4; 798 dev->counters += 4;
@@ -804,7 +804,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
804 return 0; 804 return 0;
805} 805}
806 806
807void i915_driver_lastclose(drm_device_t * dev) 807void i915_driver_lastclose(struct drm_device * dev)
808{ 808{
809 if (dev->dev_private) { 809 if (dev->dev_private) {
810 drm_i915_private_t *dev_priv = dev->dev_private; 810 drm_i915_private_t *dev_priv = dev->dev_private;
@@ -813,7 +813,7 @@ void i915_driver_lastclose(drm_device_t * dev)
813 i915_dma_cleanup(dev); 813 i915_dma_cleanup(dev);
814} 814}
815 815
816void i915_driver_preclose(drm_device_t * dev, DRMFILE filp) 816void i915_driver_preclose(struct drm_device * dev, DRMFILE filp)
817{ 817{
818 if (dev->dev_private) { 818 if (dev->dev_private) {
819 drm_i915_private_t *dev_priv = dev->dev_private; 819 drm_i915_private_t *dev_priv = dev->dev_private;
@@ -854,7 +854,7 @@ int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
854 * \returns 854 * \returns
855 * A value of 1 is always retured to indictate every i9x5 is AGP. 855 * A value of 1 is always retured to indictate every i9x5 is AGP.
856 */ 856 */
857int i915_driver_device_is_agp(drm_device_t * dev) 857int i915_driver_device_is_agp(struct drm_device * dev)
858{ 858{
859 return 1; 859 return 1;
860} 860}
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 85e323acb95d..fd918565f4e5 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -120,11 +120,11 @@ extern drm_ioctl_desc_t i915_ioctls[];
120extern int i915_max_ioctl; 120extern int i915_max_ioctl;
121 121
122 /* i915_dma.c */ 122 /* i915_dma.c */
123extern void i915_kernel_lost_context(drm_device_t * dev); 123extern void i915_kernel_lost_context(struct drm_device * dev);
124extern int i915_driver_load(struct drm_device *, unsigned long flags); 124extern int i915_driver_load(struct drm_device *, unsigned long flags);
125extern void i915_driver_lastclose(drm_device_t * dev); 125extern void i915_driver_lastclose(struct drm_device * dev);
126extern void i915_driver_preclose(drm_device_t * dev, DRMFILE filp); 126extern void i915_driver_preclose(struct drm_device * dev, DRMFILE filp);
127extern int i915_driver_device_is_agp(drm_device_t * dev); 127extern int i915_driver_device_is_agp(struct drm_device * dev);
128extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, 128extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
129 unsigned long arg); 129 unsigned long arg);
130 130
@@ -132,12 +132,12 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
132extern int i915_irq_emit(DRM_IOCTL_ARGS); 132extern int i915_irq_emit(DRM_IOCTL_ARGS);
133extern int i915_irq_wait(DRM_IOCTL_ARGS); 133extern int i915_irq_wait(DRM_IOCTL_ARGS);
134 134
135extern int i915_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence); 135extern int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence);
136extern int i915_driver_vblank_wait2(drm_device_t *dev, unsigned int *sequence); 136extern int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence);
137extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); 137extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
138extern void i915_driver_irq_preinstall(drm_device_t * dev); 138extern void i915_driver_irq_preinstall(struct drm_device * dev);
139extern void i915_driver_irq_postinstall(drm_device_t * dev); 139extern void i915_driver_irq_postinstall(struct drm_device * dev);
140extern void i915_driver_irq_uninstall(drm_device_t * dev); 140extern void i915_driver_irq_uninstall(struct drm_device * dev);
141extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS); 141extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS);
142extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS); 142extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS);
143extern int i915_vblank_swap(DRM_IOCTL_ARGS); 143extern int i915_vblank_swap(DRM_IOCTL_ARGS);
@@ -148,7 +148,7 @@ extern int i915_mem_free(DRM_IOCTL_ARGS);
148extern int i915_mem_init_heap(DRM_IOCTL_ARGS); 148extern int i915_mem_init_heap(DRM_IOCTL_ARGS);
149extern int i915_mem_destroy_heap(DRM_IOCTL_ARGS); 149extern int i915_mem_destroy_heap(DRM_IOCTL_ARGS);
150extern void i915_mem_takedown(struct mem_block **heap); 150extern void i915_mem_takedown(struct mem_block **heap);
151extern void i915_mem_release(drm_device_t * dev, 151extern void i915_mem_release(struct drm_device * dev,
152 DRMFILE filp, struct mem_block *heap); 152 DRMFILE filp, struct mem_block *heap);
153 153
154#define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, (reg)) 154#define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, (reg))
@@ -188,7 +188,7 @@ extern void i915_mem_release(drm_device_t * dev,
188 I915_WRITE(LP_RING + RING_TAIL, outring); \ 188 I915_WRITE(LP_RING + RING_TAIL, outring); \
189} while(0) 189} while(0)
190 190
191extern int i915_wait_ring(drm_device_t * dev, int n, const char *caller); 191extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
192 192
193#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23)) 193#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23))
194#define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23)) 194#define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23))
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index a5989315ec8c..4b4b2ce89863 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -42,7 +42,7 @@
42 * 42 *
43 * This function will be called with the HW lock held. 43 * This function will be called with the HW lock held.
44 */ 44 */
45static void i915_vblank_tasklet(drm_device_t *dev) 45static void i915_vblank_tasklet(struct drm_device *dev)
46{ 46{
47 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 47 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
48 unsigned long irqflags; 48 unsigned long irqflags;
@@ -211,7 +211,7 @@ static void i915_vblank_tasklet(drm_device_t *dev)
211 211
212irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) 212irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
213{ 213{
214 drm_device_t *dev = (drm_device_t *) arg; 214 struct drm_device *dev = (struct drm_device *) arg;
215 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 215 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
216 u16 temp; 216 u16 temp;
217 217
@@ -257,7 +257,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
257 return IRQ_HANDLED; 257 return IRQ_HANDLED;
258} 258}
259 259
260static int i915_emit_irq(drm_device_t * dev) 260static int i915_emit_irq(struct drm_device * dev)
261{ 261{
262 drm_i915_private_t *dev_priv = dev->dev_private; 262 drm_i915_private_t *dev_priv = dev->dev_private;
263 RING_LOCALS; 263 RING_LOCALS;
@@ -283,7 +283,7 @@ static int i915_emit_irq(drm_device_t * dev)
283 return dev_priv->counter; 283 return dev_priv->counter;
284} 284}
285 285
286static int i915_wait_irq(drm_device_t * dev, int irq_nr) 286static int i915_wait_irq(struct drm_device * dev, int irq_nr)
287{ 287{
288 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 288 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
289 int ret = 0; 289 int ret = 0;
@@ -309,7 +309,7 @@ static int i915_wait_irq(drm_device_t * dev, int irq_nr)
309 return ret; 309 return ret;
310} 310}
311 311
312static int i915_driver_vblank_do_wait(drm_device_t *dev, unsigned int *sequence, 312static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequence,
313 atomic_t *counter) 313 atomic_t *counter)
314{ 314{
315 drm_i915_private_t *dev_priv = dev->dev_private; 315 drm_i915_private_t *dev_priv = dev->dev_private;
@@ -331,12 +331,12 @@ static int i915_driver_vblank_do_wait(drm_device_t *dev, unsigned int *sequence,
331} 331}
332 332
333 333
334int i915_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence) 334int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence)
335{ 335{
336 return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received); 336 return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received);
337} 337}
338 338
339int i915_driver_vblank_wait2(drm_device_t *dev, unsigned int *sequence) 339int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence)
340{ 340{
341 return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received2); 341 return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received2);
342} 342}
@@ -389,7 +389,7 @@ int i915_irq_wait(DRM_IOCTL_ARGS)
389 return i915_wait_irq(dev, irqwait.irq_seq); 389 return i915_wait_irq(dev, irqwait.irq_seq);
390} 390}
391 391
392static void i915_enable_interrupt (drm_device_t *dev) 392static void i915_enable_interrupt (struct drm_device *dev)
393{ 393{
394 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 394 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
395 u16 flag; 395 u16 flag;
@@ -569,7 +569,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
569 569
570/* drm_dma.h hooks 570/* drm_dma.h hooks
571*/ 571*/
572void i915_driver_irq_preinstall(drm_device_t * dev) 572void i915_driver_irq_preinstall(struct drm_device * dev)
573{ 573{
574 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 574 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
575 575
@@ -578,7 +578,7 @@ void i915_driver_irq_preinstall(drm_device_t * dev)
578 I915_WRITE16(I915REG_INT_ENABLE_R, 0x0); 578 I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
579} 579}
580 580
581void i915_driver_irq_postinstall(drm_device_t * dev) 581void i915_driver_irq_postinstall(struct drm_device * dev)
582{ 582{
583 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 583 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
584 584
@@ -592,7 +592,7 @@ void i915_driver_irq_postinstall(drm_device_t * dev)
592 DRM_INIT_WAITQUEUE(&dev_priv->irq_queue); 592 DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
593} 593}
594 594
595void i915_driver_irq_uninstall(drm_device_t * dev) 595void i915_driver_irq_uninstall(struct drm_device * dev)
596{ 596{
597 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 597 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
598 u16 temp; 598 u16 temp;
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index c0ee1dae82c3..50b4bacef0e0 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -43,7 +43,7 @@
43 * block to allocate, and the ring is drained prior to allocations -- 43 * block to allocate, and the ring is drained prior to allocations --
44 * in other words allocation is expensive. 44 * in other words allocation is expensive.
45 */ 45 */
46static void mark_block(drm_device_t * dev, struct mem_block *p, int in_use) 46static void mark_block(struct drm_device * dev, struct mem_block *p, int in_use)
47{ 47{
48 drm_i915_private_t *dev_priv = dev->dev_private; 48 drm_i915_private_t *dev_priv = dev->dev_private;
49 drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv; 49 drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -208,7 +208,7 @@ static int init_heap(struct mem_block **heap, int start, int size)
208 208
209/* Free all blocks associated with the releasing file. 209/* Free all blocks associated with the releasing file.
210 */ 210 */
211void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap) 211void i915_mem_release(struct drm_device * dev, DRMFILE filp, struct mem_block *heap)
212{ 212{
213 struct mem_block *p; 213 struct mem_block *p;
214 214
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index 4a517cc133b7..0035e199c320 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -706,7 +706,7 @@ static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)
706 * The actual age emit is done by r300_do_cp_cmdbuf, which is why you must 706 * The actual age emit is done by r300_do_cp_cmdbuf, which is why you must
707 * be careful about how this function is called. 707 * be careful about how this function is called.
708 */ 708 */
709static void r300_discard_buffer(drm_device_t * dev, drm_buf_t * buf) 709static void r300_discard_buffer(struct drm_device * dev, drm_buf_t * buf)
710{ 710{
711 drm_radeon_private_t *dev_priv = dev->dev_private; 711 drm_radeon_private_t *dev_priv = dev->dev_private;
712 drm_radeon_buf_priv_t *buf_priv = buf->dev_private; 712 drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
@@ -779,9 +779,9 @@ static int r300_scratch(drm_radeon_private_t *dev_priv,
779 * commands on the DMA ring buffer. 779 * commands on the DMA ring buffer.
780 * Called by the ioctl handler function radeon_cp_cmdbuf. 780 * Called by the ioctl handler function radeon_cp_cmdbuf.
781 */ 781 */
782int r300_do_cp_cmdbuf(drm_device_t *dev, 782int r300_do_cp_cmdbuf(struct drm_device *dev,
783 DRMFILE filp, 783 DRMFILE filp,
784 drm_file_t *filp_priv, 784 struct drm_file *filp_priv,
785 drm_radeon_kcmd_buffer_t *cmdbuf) 785 drm_radeon_kcmd_buffer_t *cmdbuf)
786{ 786{
787 drm_radeon_private_t *dev_priv = dev->dev_private; 787 drm_radeon_private_t *dev_priv = dev->dev_private;
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index cfc5aa16de22..d75a0ee5f47c 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -36,7 +36,7 @@
36 36
37#define RADEON_FIFO_DEBUG 0 37#define RADEON_FIFO_DEBUG 0
38 38
39static int radeon_do_cleanup_cp(drm_device_t * dev); 39static int radeon_do_cleanup_cp(struct drm_device * dev);
40 40
41/* CP microcode (from ATI) */ 41/* CP microcode (from ATI) */
42static const u32 R200_cp_microcode[][2] = { 42static const u32 R200_cp_microcode[][2] = {
@@ -816,7 +816,7 @@ static const u32 R300_cp_microcode[][2] = {
816 {0000000000, 0000000000}, 816 {0000000000, 0000000000},
817}; 817};
818 818
819static int RADEON_READ_PLL(drm_device_t * dev, int addr) 819static int RADEON_READ_PLL(struct drm_device * dev, int addr)
820{ 820{
821 drm_radeon_private_t *dev_priv = dev->dev_private; 821 drm_radeon_private_t *dev_priv = dev->dev_private;
822 822
@@ -1066,7 +1066,7 @@ static void radeon_do_cp_stop(drm_radeon_private_t * dev_priv)
1066 1066
1067/* Reset the engine. This will stop the CP if it is running. 1067/* Reset the engine. This will stop the CP if it is running.
1068 */ 1068 */
1069static int radeon_do_engine_reset(drm_device_t * dev) 1069static int radeon_do_engine_reset(struct drm_device * dev)
1070{ 1070{
1071 drm_radeon_private_t *dev_priv = dev->dev_private; 1071 drm_radeon_private_t *dev_priv = dev->dev_private;
1072 u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset; 1072 u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset;
@@ -1122,7 +1122,7 @@ static int radeon_do_engine_reset(drm_device_t * dev)
1122 return 0; 1122 return 0;
1123} 1123}
1124 1124
1125static void radeon_cp_init_ring_buffer(drm_device_t * dev, 1125static void radeon_cp_init_ring_buffer(struct drm_device * dev,
1126 drm_radeon_private_t * dev_priv) 1126 drm_radeon_private_t * dev_priv)
1127{ 1127{
1128 u32 ring_start, cur_read_ptr; 1128 u32 ring_start, cur_read_ptr;
@@ -1384,7 +1384,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
1384 } 1384 }
1385} 1385}
1386 1386
1387static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) 1387static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
1388{ 1388{
1389 drm_radeon_private_t *dev_priv = dev->dev_private; 1389 drm_radeon_private_t *dev_priv = dev->dev_private;
1390 1390
@@ -1735,7 +1735,7 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
1735 return 0; 1735 return 0;
1736} 1736}
1737 1737
1738static int radeon_do_cleanup_cp(drm_device_t * dev) 1738static int radeon_do_cleanup_cp(struct drm_device * dev)
1739{ 1739{
1740 drm_radeon_private_t *dev_priv = dev->dev_private; 1740 drm_radeon_private_t *dev_priv = dev->dev_private;
1741 DRM_DEBUG("\n"); 1741 DRM_DEBUG("\n");
@@ -1791,7 +1791,7 @@ static int radeon_do_cleanup_cp(drm_device_t * dev)
1791 * 1791 *
1792 * Charl P. Botha <http://cpbotha.net> 1792 * Charl P. Botha <http://cpbotha.net>
1793 */ 1793 */
1794static int radeon_do_resume_cp(drm_device_t * dev) 1794static int radeon_do_resume_cp(struct drm_device * dev)
1795{ 1795{
1796 drm_radeon_private_t *dev_priv = dev->dev_private; 1796 drm_radeon_private_t *dev_priv = dev->dev_private;
1797 1797
@@ -1918,7 +1918,7 @@ int radeon_cp_stop(DRM_IOCTL_ARGS)
1918 return 0; 1918 return 0;
1919} 1919}
1920 1920
1921void radeon_do_release(drm_device_t * dev) 1921void radeon_do_release(struct drm_device * dev)
1922{ 1922{
1923 drm_radeon_private_t *dev_priv = dev->dev_private; 1923 drm_radeon_private_t *dev_priv = dev->dev_private;
1924 int i, ret; 1924 int i, ret;
@@ -2046,7 +2046,7 @@ int radeon_fullscreen(DRM_IOCTL_ARGS)
2046 * they can't get the lock. 2046 * they can't get the lock.
2047 */ 2047 */
2048 2048
2049drm_buf_t *radeon_freelist_get(drm_device_t * dev) 2049drm_buf_t *radeon_freelist_get(struct drm_device * dev)
2050{ 2050{
2051 drm_device_dma_t *dma = dev->dma; 2051 drm_device_dma_t *dma = dev->dma;
2052 drm_radeon_private_t *dev_priv = dev->dev_private; 2052 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -2086,7 +2086,7 @@ drm_buf_t *radeon_freelist_get(drm_device_t * dev)
2086} 2086}
2087 2087
2088#if 0 2088#if 0
2089drm_buf_t *radeon_freelist_get(drm_device_t * dev) 2089drm_buf_t *radeon_freelist_get(struct drm_device * dev)
2090{ 2090{
2091 drm_device_dma_t *dma = dev->dma; 2091 drm_device_dma_t *dma = dev->dma;
2092 drm_radeon_private_t *dev_priv = dev->dev_private; 2092 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -2120,7 +2120,7 @@ drm_buf_t *radeon_freelist_get(drm_device_t * dev)
2120} 2120}
2121#endif 2121#endif
2122 2122
2123void radeon_freelist_reset(drm_device_t * dev) 2123void radeon_freelist_reset(struct drm_device * dev)
2124{ 2124{
2125 drm_device_dma_t *dma = dev->dma; 2125 drm_device_dma_t *dma = dev->dma;
2126 drm_radeon_private_t *dev_priv = dev->dev_private; 2126 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -2170,7 +2170,7 @@ int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n)
2170 return DRM_ERR(EBUSY); 2170 return DRM_ERR(EBUSY);
2171} 2171}
2172 2172
2173static int radeon_cp_get_buffers(DRMFILE filp, drm_device_t * dev, 2173static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev,
2174 struct drm_dma * d) 2174 struct drm_dma * d)
2175{ 2175{
2176 int i; 2176 int i;
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index e4b4e4be9bb5..abcae05c2873 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -336,8 +336,8 @@ extern int radeon_engine_reset(DRM_IOCTL_ARGS);
336extern int radeon_fullscreen(DRM_IOCTL_ARGS); 336extern int radeon_fullscreen(DRM_IOCTL_ARGS);
337extern int radeon_cp_buffers(DRM_IOCTL_ARGS); 337extern int radeon_cp_buffers(DRM_IOCTL_ARGS);
338 338
339extern void radeon_freelist_reset(drm_device_t * dev); 339extern void radeon_freelist_reset(struct drm_device * dev);
340extern drm_buf_t *radeon_freelist_get(drm_device_t * dev); 340extern drm_buf_t *radeon_freelist_get(struct drm_device * dev);
341 341
342extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n); 342extern int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n);
343 343
@@ -357,33 +357,33 @@ extern void radeon_mem_release(DRMFILE filp, struct mem_block *heap);
357extern int radeon_irq_emit(DRM_IOCTL_ARGS); 357extern int radeon_irq_emit(DRM_IOCTL_ARGS);
358extern int radeon_irq_wait(DRM_IOCTL_ARGS); 358extern int radeon_irq_wait(DRM_IOCTL_ARGS);
359 359
360extern void radeon_do_release(drm_device_t * dev); 360extern void radeon_do_release(struct drm_device * dev);
361extern int radeon_driver_vblank_wait(drm_device_t * dev, 361extern int radeon_driver_vblank_wait(struct drm_device * dev,
362 unsigned int *sequence); 362 unsigned int *sequence);
363extern int radeon_driver_vblank_wait2(drm_device_t * dev, 363extern int radeon_driver_vblank_wait2(struct drm_device * dev,
364 unsigned int *sequence); 364 unsigned int *sequence);
365extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS); 365extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS);
366extern void radeon_driver_irq_preinstall(drm_device_t * dev); 366extern void radeon_driver_irq_preinstall(struct drm_device * dev);
367extern void radeon_driver_irq_postinstall(drm_device_t * dev); 367extern void radeon_driver_irq_postinstall(struct drm_device * dev);
368extern void radeon_driver_irq_uninstall(drm_device_t * dev); 368extern void radeon_driver_irq_uninstall(struct drm_device * dev);
369extern int radeon_vblank_crtc_get(drm_device_t *dev); 369extern int radeon_vblank_crtc_get(struct drm_device *dev);
370extern int radeon_vblank_crtc_set(drm_device_t *dev, int64_t value); 370extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
371 371
372extern int radeon_driver_load(struct drm_device *dev, unsigned long flags); 372extern int radeon_driver_load(struct drm_device *dev, unsigned long flags);
373extern int radeon_driver_unload(struct drm_device *dev); 373extern int radeon_driver_unload(struct drm_device *dev);
374extern int radeon_driver_firstopen(struct drm_device *dev); 374extern int radeon_driver_firstopen(struct drm_device *dev);
375extern void radeon_driver_preclose(drm_device_t * dev, DRMFILE filp); 375extern void radeon_driver_preclose(struct drm_device * dev, DRMFILE filp);
376extern void radeon_driver_postclose(drm_device_t * dev, drm_file_t * filp); 376extern void radeon_driver_postclose(struct drm_device * dev, struct drm_file * filp);
377extern void radeon_driver_lastclose(drm_device_t * dev); 377extern void radeon_driver_lastclose(struct drm_device * dev);
378extern int radeon_driver_open(drm_device_t * dev, drm_file_t * filp_priv); 378extern int radeon_driver_open(struct drm_device * dev, struct drm_file * filp_priv);
379extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd, 379extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
380 unsigned long arg); 380 unsigned long arg);
381 381
382/* r300_cmdbuf.c */ 382/* r300_cmdbuf.c */
383extern void r300_init_reg_flags(void); 383extern void r300_init_reg_flags(void);
384 384
385extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp, 385extern int r300_do_cp_cmdbuf(struct drm_device * dev, DRMFILE filp,
386 drm_file_t * filp_priv, 386 struct drm_file * filp_priv,
387 drm_radeon_kcmd_buffer_t * cmdbuf); 387 drm_radeon_kcmd_buffer_t * cmdbuf);
388 388
389/* Flags for stats.boxes 389/* Flags for stats.boxes
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index a4be86e38121..ad8a0ac7182e 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -64,7 +64,7 @@ static __inline__ u32 radeon_acknowledge_irqs(drm_radeon_private_t * dev_priv,
64 64
65irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) 65irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
66{ 66{
67 drm_device_t *dev = (drm_device_t *) arg; 67 struct drm_device *dev = (struct drm_device *) arg;
68 drm_radeon_private_t *dev_priv = 68 drm_radeon_private_t *dev_priv =
69 (drm_radeon_private_t *) dev->dev_private; 69 (drm_radeon_private_t *) dev->dev_private;
70 u32 stat; 70 u32 stat;
@@ -109,7 +109,7 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
109 return IRQ_HANDLED; 109 return IRQ_HANDLED;
110} 110}
111 111
112static int radeon_emit_irq(drm_device_t * dev) 112static int radeon_emit_irq(struct drm_device * dev)
113{ 113{
114 drm_radeon_private_t *dev_priv = dev->dev_private; 114 drm_radeon_private_t *dev_priv = dev->dev_private;
115 unsigned int ret; 115 unsigned int ret;
@@ -127,7 +127,7 @@ static int radeon_emit_irq(drm_device_t * dev)
127 return ret; 127 return ret;
128} 128}
129 129
130static int radeon_wait_irq(drm_device_t * dev, int swi_nr) 130static int radeon_wait_irq(struct drm_device * dev, int swi_nr)
131{ 131{
132 drm_radeon_private_t *dev_priv = 132 drm_radeon_private_t *dev_priv =
133 (drm_radeon_private_t *) dev->dev_private; 133 (drm_radeon_private_t *) dev->dev_private;
@@ -144,7 +144,7 @@ static int radeon_wait_irq(drm_device_t * dev, int swi_nr)
144 return ret; 144 return ret;
145} 145}
146 146
147int radeon_driver_vblank_do_wait(drm_device_t * dev, unsigned int *sequence, 147int radeon_driver_vblank_do_wait(struct drm_device * dev, unsigned int *sequence,
148 int crtc) 148 int crtc)
149{ 149{
150 drm_radeon_private_t *dev_priv = 150 drm_radeon_private_t *dev_priv =
@@ -184,12 +184,12 @@ int radeon_driver_vblank_do_wait(drm_device_t * dev, unsigned int *sequence,
184 return ret; 184 return ret;
185} 185}
186 186
187int radeon_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence) 187int radeon_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence)
188{ 188{
189 return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC1); 189 return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC1);
190} 190}
191 191
192int radeon_driver_vblank_wait2(drm_device_t *dev, unsigned int *sequence) 192int radeon_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence)
193{ 193{
194 return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC2); 194 return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC2);
195} 195}
@@ -242,7 +242,7 @@ int radeon_irq_wait(DRM_IOCTL_ARGS)
242 return radeon_wait_irq(dev, irqwait.irq_seq); 242 return radeon_wait_irq(dev, irqwait.irq_seq);
243} 243}
244 244
245static void radeon_enable_interrupt(drm_device_t *dev) 245static void radeon_enable_interrupt(struct drm_device *dev)
246{ 246{
247 drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; 247 drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private;
248 248
@@ -259,7 +259,7 @@ static void radeon_enable_interrupt(drm_device_t *dev)
259 259
260/* drm_dma.h hooks 260/* drm_dma.h hooks
261*/ 261*/
262void radeon_driver_irq_preinstall(drm_device_t * dev) 262void radeon_driver_irq_preinstall(struct drm_device * dev)
263{ 263{
264 drm_radeon_private_t *dev_priv = 264 drm_radeon_private_t *dev_priv =
265 (drm_radeon_private_t *) dev->dev_private; 265 (drm_radeon_private_t *) dev->dev_private;
@@ -273,7 +273,7 @@ void radeon_driver_irq_preinstall(drm_device_t * dev)
273 RADEON_CRTC2_VBLANK_STAT)); 273 RADEON_CRTC2_VBLANK_STAT));
274} 274}
275 275
276void radeon_driver_irq_postinstall(drm_device_t * dev) 276void radeon_driver_irq_postinstall(struct drm_device * dev)
277{ 277{
278 drm_radeon_private_t *dev_priv = 278 drm_radeon_private_t *dev_priv =
279 (drm_radeon_private_t *) dev->dev_private; 279 (drm_radeon_private_t *) dev->dev_private;
@@ -284,7 +284,7 @@ void radeon_driver_irq_postinstall(drm_device_t * dev)
284 radeon_enable_interrupt(dev); 284 radeon_enable_interrupt(dev);
285} 285}
286 286
287void radeon_driver_irq_uninstall(drm_device_t * dev) 287void radeon_driver_irq_uninstall(struct drm_device * dev)
288{ 288{
289 drm_radeon_private_t *dev_priv = 289 drm_radeon_private_t *dev_priv =
290 (drm_radeon_private_t *) dev->dev_private; 290 (drm_radeon_private_t *) dev->dev_private;
@@ -298,7 +298,7 @@ void radeon_driver_irq_uninstall(drm_device_t * dev)
298} 298}
299 299
300 300
301int radeon_vblank_crtc_get(drm_device_t *dev) 301int radeon_vblank_crtc_get(struct drm_device *dev)
302{ 302{
303 drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; 303 drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private;
304 u32 flag; 304 u32 flag;
@@ -315,7 +315,7 @@ int radeon_vblank_crtc_get(drm_device_t *dev)
315 return value; 315 return value;
316} 316}
317 317
318int radeon_vblank_crtc_set(drm_device_t *dev, int64_t value) 318int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value)
319{ 319{
320 drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; 320 drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private;
321 if (value & ~(DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) { 321 if (value & ~(DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) {
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 348a89e05812..2f325c79915e 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -39,7 +39,7 @@
39 39
40static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t * 40static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
41 dev_priv, 41 dev_priv,
42 drm_file_t * filp_priv, 42 struct drm_file * filp_priv,
43 u32 *offset) 43 u32 *offset)
44{ 44{
45 u64 off = *offset; 45 u64 off = *offset;
@@ -90,7 +90,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
90 90
91static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t * 91static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
92 dev_priv, 92 dev_priv,
93 drm_file_t * filp_priv, 93 struct drm_file * filp_priv,
94 int id, u32 *data) 94 int id, u32 *data)
95{ 95{
96 switch (id) { 96 switch (id) {
@@ -264,7 +264,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
264 264
265static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t * 265static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
266 dev_priv, 266 dev_priv,
267 drm_file_t *filp_priv, 267 struct drm_file *filp_priv,
268 drm_radeon_kcmd_buffer_t * 268 drm_radeon_kcmd_buffer_t *
269 cmdbuf, 269 cmdbuf,
270 unsigned int *cmdsz) 270 unsigned int *cmdsz)
@@ -439,7 +439,7 @@ static __inline__ void radeon_emit_clip_rect(drm_radeon_private_t * dev_priv,
439/* Emit 1.1 state 439/* Emit 1.1 state
440 */ 440 */
441static int radeon_emit_state(drm_radeon_private_t * dev_priv, 441static int radeon_emit_state(drm_radeon_private_t * dev_priv,
442 drm_file_t * filp_priv, 442 struct drm_file * filp_priv,
443 drm_radeon_context_regs_t * ctx, 443 drm_radeon_context_regs_t * ctx,
444 drm_radeon_texture_regs_t * tex, 444 drm_radeon_texture_regs_t * tex,
445 unsigned int dirty) 445 unsigned int dirty)
@@ -608,7 +608,7 @@ static int radeon_emit_state(drm_radeon_private_t * dev_priv,
608/* Emit 1.2 state 608/* Emit 1.2 state
609 */ 609 */
610static int radeon_emit_state2(drm_radeon_private_t * dev_priv, 610static int radeon_emit_state2(drm_radeon_private_t * dev_priv,
611 drm_file_t * filp_priv, 611 struct drm_file * filp_priv,
612 drm_radeon_state_t * state) 612 drm_radeon_state_t * state)
613{ 613{
614 RING_LOCALS; 614 RING_LOCALS;
@@ -844,7 +844,7 @@ static void radeon_cp_performance_boxes(drm_radeon_private_t * dev_priv)
844 * CP command dispatch functions 844 * CP command dispatch functions
845 */ 845 */
846 846
847static void radeon_cp_dispatch_clear(drm_device_t * dev, 847static void radeon_cp_dispatch_clear(struct drm_device * dev,
848 drm_radeon_clear_t * clear, 848 drm_radeon_clear_t * clear,
849 drm_radeon_clear_rect_t * depth_boxes) 849 drm_radeon_clear_rect_t * depth_boxes)
850{ 850{
@@ -1335,7 +1335,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev,
1335 ADVANCE_RING(); 1335 ADVANCE_RING();
1336} 1336}
1337 1337
1338static void radeon_cp_dispatch_swap(drm_device_t * dev) 1338static void radeon_cp_dispatch_swap(struct drm_device * dev)
1339{ 1339{
1340 drm_radeon_private_t *dev_priv = dev->dev_private; 1340 drm_radeon_private_t *dev_priv = dev->dev_private;
1341 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; 1341 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -1412,7 +1412,7 @@ static void radeon_cp_dispatch_swap(drm_device_t * dev)
1412 ADVANCE_RING(); 1412 ADVANCE_RING();
1413} 1413}
1414 1414
1415static void radeon_cp_dispatch_flip(drm_device_t * dev) 1415static void radeon_cp_dispatch_flip(struct drm_device * dev)
1416{ 1416{
1417 drm_radeon_private_t *dev_priv = dev->dev_private; 1417 drm_radeon_private_t *dev_priv = dev->dev_private;
1418 drm_sarea_t *sarea = (drm_sarea_t *) dev_priv->sarea->handle; 1418 drm_sarea_t *sarea = (drm_sarea_t *) dev_priv->sarea->handle;
@@ -1491,7 +1491,7 @@ typedef struct {
1491 unsigned int vc_format; 1491 unsigned int vc_format;
1492} drm_radeon_tcl_prim_t; 1492} drm_radeon_tcl_prim_t;
1493 1493
1494static void radeon_cp_dispatch_vertex(drm_device_t * dev, 1494static void radeon_cp_dispatch_vertex(struct drm_device * dev,
1495 drm_buf_t * buf, 1495 drm_buf_t * buf,
1496 drm_radeon_tcl_prim_t * prim) 1496 drm_radeon_tcl_prim_t * prim)
1497{ 1497{
@@ -1537,7 +1537,7 @@ static void radeon_cp_dispatch_vertex(drm_device_t * dev,
1537 } while (i < nbox); 1537 } while (i < nbox);
1538} 1538}
1539 1539
1540static void radeon_cp_discard_buffer(drm_device_t * dev, drm_buf_t * buf) 1540static void radeon_cp_discard_buffer(struct drm_device * dev, drm_buf_t * buf)
1541{ 1541{
1542 drm_radeon_private_t *dev_priv = dev->dev_private; 1542 drm_radeon_private_t *dev_priv = dev->dev_private;
1543 drm_radeon_buf_priv_t *buf_priv = buf->dev_private; 1543 drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
@@ -1554,7 +1554,7 @@ static void radeon_cp_discard_buffer(drm_device_t * dev, drm_buf_t * buf)
1554 buf->used = 0; 1554 buf->used = 0;
1555} 1555}
1556 1556
1557static void radeon_cp_dispatch_indirect(drm_device_t * dev, 1557static void radeon_cp_dispatch_indirect(struct drm_device * dev,
1558 drm_buf_t * buf, int start, int end) 1558 drm_buf_t * buf, int start, int end)
1559{ 1559{
1560 drm_radeon_private_t *dev_priv = dev->dev_private; 1560 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -1588,7 +1588,7 @@ static void radeon_cp_dispatch_indirect(drm_device_t * dev,
1588 } 1588 }
1589} 1589}
1590 1590
1591static void radeon_cp_dispatch_indices(drm_device_t * dev, 1591static void radeon_cp_dispatch_indices(struct drm_device * dev,
1592 drm_buf_t * elt_buf, 1592 drm_buf_t * elt_buf,
1593 drm_radeon_tcl_prim_t * prim) 1593 drm_radeon_tcl_prim_t * prim)
1594{ 1594{
@@ -1647,12 +1647,12 @@ static void radeon_cp_dispatch_indices(drm_device_t * dev,
1647#define RADEON_MAX_TEXTURE_SIZE RADEON_BUFFER_SIZE 1647#define RADEON_MAX_TEXTURE_SIZE RADEON_BUFFER_SIZE
1648 1648
1649static int radeon_cp_dispatch_texture(DRMFILE filp, 1649static int radeon_cp_dispatch_texture(DRMFILE filp,
1650 drm_device_t * dev, 1650 struct drm_device * dev,
1651 drm_radeon_texture_t * tex, 1651 drm_radeon_texture_t * tex,
1652 drm_radeon_tex_image_t * image) 1652 drm_radeon_tex_image_t * image)
1653{ 1653{
1654 drm_radeon_private_t *dev_priv = dev->dev_private; 1654 drm_radeon_private_t *dev_priv = dev->dev_private;
1655 drm_file_t *filp_priv; 1655 struct drm_file *filp_priv;
1656 drm_buf_t *buf; 1656 drm_buf_t *buf;
1657 u32 format; 1657 u32 format;
1658 u32 *buffer; 1658 u32 *buffer;
@@ -1881,7 +1881,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
1881 return 0; 1881 return 0;
1882} 1882}
1883 1883
1884static void radeon_cp_dispatch_stipple(drm_device_t * dev, u32 * stipple) 1884static void radeon_cp_dispatch_stipple(struct drm_device * dev, u32 * stipple)
1885{ 1885{
1886 drm_radeon_private_t *dev_priv = dev->dev_private; 1886 drm_radeon_private_t *dev_priv = dev->dev_private;
1887 int i; 1887 int i;
@@ -2134,7 +2134,7 @@ static int radeon_cp_clear(DRM_IOCTL_ARGS)
2134 2134
2135/* Not sure why this isn't set all the time: 2135/* Not sure why this isn't set all the time:
2136 */ 2136 */
2137static int radeon_do_init_pageflip(drm_device_t * dev) 2137static int radeon_do_init_pageflip(struct drm_device * dev)
2138{ 2138{
2139 drm_radeon_private_t *dev_priv = dev->dev_private; 2139 drm_radeon_private_t *dev_priv = dev->dev_private;
2140 RING_LOCALS; 2140 RING_LOCALS;
@@ -2206,7 +2206,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
2206{ 2206{
2207 DRM_DEVICE; 2207 DRM_DEVICE;
2208 drm_radeon_private_t *dev_priv = dev->dev_private; 2208 drm_radeon_private_t *dev_priv = dev->dev_private;
2209 drm_file_t *filp_priv; 2209 struct drm_file *filp_priv;
2210 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; 2210 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
2211 drm_device_dma_t *dma = dev->dma; 2211 drm_device_dma_t *dma = dev->dma;
2212 drm_buf_t *buf; 2212 drm_buf_t *buf;
@@ -2289,7 +2289,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
2289{ 2289{
2290 DRM_DEVICE; 2290 DRM_DEVICE;
2291 drm_radeon_private_t *dev_priv = dev->dev_private; 2291 drm_radeon_private_t *dev_priv = dev->dev_private;
2292 drm_file_t *filp_priv; 2292 struct drm_file *filp_priv;
2293 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; 2293 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
2294 drm_device_dma_t *dma = dev->dma; 2294 drm_device_dma_t *dma = dev->dma;
2295 drm_buf_t *buf; 2295 drm_buf_t *buf;
@@ -2507,7 +2507,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
2507{ 2507{
2508 DRM_DEVICE; 2508 DRM_DEVICE;
2509 drm_radeon_private_t *dev_priv = dev->dev_private; 2509 drm_radeon_private_t *dev_priv = dev->dev_private;
2510 drm_file_t *filp_priv; 2510 struct drm_file *filp_priv;
2511 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; 2511 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
2512 drm_device_dma_t *dma = dev->dma; 2512 drm_device_dma_t *dma = dev->dma;
2513 drm_buf_t *buf; 2513 drm_buf_t *buf;
@@ -2603,7 +2603,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
2603} 2603}
2604 2604
2605static int radeon_emit_packets(drm_radeon_private_t * dev_priv, 2605static int radeon_emit_packets(drm_radeon_private_t * dev_priv,
2606 drm_file_t * filp_priv, 2606 struct drm_file * filp_priv,
2607 drm_radeon_cmd_header_t header, 2607 drm_radeon_cmd_header_t header,
2608 drm_radeon_kcmd_buffer_t *cmdbuf) 2608 drm_radeon_kcmd_buffer_t *cmdbuf)
2609{ 2609{
@@ -2728,8 +2728,8 @@ static __inline__ int radeon_emit_veclinear(drm_radeon_private_t *dev_priv,
2728 return 0; 2728 return 0;
2729} 2729}
2730 2730
2731static int radeon_emit_packet3(drm_device_t * dev, 2731static int radeon_emit_packet3(struct drm_device * dev,
2732 drm_file_t * filp_priv, 2732 struct drm_file * filp_priv,
2733 drm_radeon_kcmd_buffer_t *cmdbuf) 2733 drm_radeon_kcmd_buffer_t *cmdbuf)
2734{ 2734{
2735 drm_radeon_private_t *dev_priv = dev->dev_private; 2735 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -2754,8 +2754,8 @@ static int radeon_emit_packet3(drm_device_t * dev,
2754 return 0; 2754 return 0;
2755} 2755}
2756 2756
2757static int radeon_emit_packet3_cliprect(drm_device_t *dev, 2757static int radeon_emit_packet3_cliprect(struct drm_device *dev,
2758 drm_file_t *filp_priv, 2758 struct drm_file *filp_priv,
2759 drm_radeon_kcmd_buffer_t *cmdbuf, 2759 drm_radeon_kcmd_buffer_t *cmdbuf,
2760 int orig_nbox) 2760 int orig_nbox)
2761{ 2761{
@@ -2816,7 +2816,7 @@ static int radeon_emit_packet3_cliprect(drm_device_t *dev,
2816 return 0; 2816 return 0;
2817} 2817}
2818 2818
2819static int radeon_emit_wait(drm_device_t * dev, int flags) 2819static int radeon_emit_wait(struct drm_device * dev, int flags)
2820{ 2820{
2821 drm_radeon_private_t *dev_priv = dev->dev_private; 2821 drm_radeon_private_t *dev_priv = dev->dev_private;
2822 RING_LOCALS; 2822 RING_LOCALS;
@@ -2849,7 +2849,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
2849{ 2849{
2850 DRM_DEVICE; 2850 DRM_DEVICE;
2851 drm_radeon_private_t *dev_priv = dev->dev_private; 2851 drm_radeon_private_t *dev_priv = dev->dev_private;
2852 drm_file_t *filp_priv; 2852 struct drm_file *filp_priv;
2853 drm_device_dma_t *dma = dev->dma; 2853 drm_device_dma_t *dma = dev->dma;
2854 drm_buf_t *buf = NULL; 2854 drm_buf_t *buf = NULL;
2855 int idx; 2855 int idx;
@@ -3105,7 +3105,7 @@ static int radeon_cp_setparam(DRM_IOCTL_ARGS)
3105{ 3105{
3106 DRM_DEVICE; 3106 DRM_DEVICE;
3107 drm_radeon_private_t *dev_priv = dev->dev_private; 3107 drm_radeon_private_t *dev_priv = dev->dev_private;
3108 drm_file_t *filp_priv; 3108 struct drm_file *filp_priv;
3109 drm_radeon_setparam_t sp; 3109 drm_radeon_setparam_t sp;
3110 struct drm_radeon_driver_file_fields *radeon_priv; 3110 struct drm_radeon_driver_file_fields *radeon_priv;
3111 3111
@@ -3162,7 +3162,7 @@ static int radeon_cp_setparam(DRM_IOCTL_ARGS)
3162 * 3162 *
3163 * DRM infrastructure takes care of reclaiming dma buffers. 3163 * DRM infrastructure takes care of reclaiming dma buffers.
3164 */ 3164 */
3165void radeon_driver_preclose(drm_device_t * dev, DRMFILE filp) 3165void radeon_driver_preclose(struct drm_device *dev, DRMFILE filp)
3166{ 3166{
3167 if (dev->dev_private) { 3167 if (dev->dev_private) {
3168 drm_radeon_private_t *dev_priv = dev->dev_private; 3168 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -3173,7 +3173,7 @@ void radeon_driver_preclose(drm_device_t * dev, DRMFILE filp)
3173 } 3173 }
3174} 3174}
3175 3175
3176void radeon_driver_lastclose(drm_device_t * dev) 3176void radeon_driver_lastclose(struct drm_device *dev)
3177{ 3177{
3178 if (dev->dev_private) { 3178 if (dev->dev_private) {
3179 drm_radeon_private_t *dev_priv = dev->dev_private; 3179 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -3186,7 +3186,7 @@ void radeon_driver_lastclose(drm_device_t * dev)
3186 radeon_do_release(dev); 3186 radeon_do_release(dev);
3187} 3187}
3188 3188
3189int radeon_driver_open(drm_device_t * dev, drm_file_t * filp_priv) 3189int radeon_driver_open(struct drm_device *dev, struct drm_file *filp_priv)
3190{ 3190{
3191 drm_radeon_private_t *dev_priv = dev->dev_private; 3191 drm_radeon_private_t *dev_priv = dev->dev_private;
3192 struct drm_radeon_driver_file_fields *radeon_priv; 3192 struct drm_radeon_driver_file_fields *radeon_priv;
@@ -3208,7 +3208,7 @@ int radeon_driver_open(drm_device_t * dev, drm_file_t * filp_priv)
3208 return 0; 3208 return 0;
3209} 3209}
3210 3210
3211void radeon_driver_postclose(drm_device_t * dev, drm_file_t * filp_priv) 3211void radeon_driver_postclose(struct drm_device *dev, struct drm_file *filp_priv)
3212{ 3212{
3213 struct drm_radeon_driver_file_fields *radeon_priv = 3213 struct drm_radeon_driver_file_fields *radeon_priv =
3214 filp_priv->driver_priv; 3214 filp_priv->driver_priv;
diff --git a/drivers/char/drm/sis_drv.c b/drivers/char/drm/sis_drv.c
index 690e0af8e7c2..1912f5857051 100644
--- a/drivers/char/drm/sis_drv.c
+++ b/drivers/char/drm/sis_drv.c
@@ -35,7 +35,7 @@ static struct pci_device_id pciidlist[] = {
35 sisdrv_PCI_IDS 35 sisdrv_PCI_IDS
36}; 36};
37 37
38static int sis_driver_load(drm_device_t *dev, unsigned long chipset) 38static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
39{ 39{
40 drm_sis_private_t *dev_priv; 40 drm_sis_private_t *dev_priv;
41 int ret; 41 int ret;
@@ -54,7 +54,7 @@ static int sis_driver_load(drm_device_t *dev, unsigned long chipset)
54 return ret; 54 return ret;
55} 55}
56 56
57static int sis_driver_unload(drm_device_t *dev) 57static int sis_driver_unload(struct drm_device *dev)
58{ 58{
59 drm_sis_private_t *dev_priv = dev->dev_private; 59 drm_sis_private_t *dev_priv = dev->dev_private;
60 60
diff --git a/drivers/char/drm/sis_drv.h b/drivers/char/drm/sis_drv.h
index 70d4ede75fe8..83c0ef264a15 100644
--- a/drivers/char/drm/sis_drv.h
+++ b/drivers/char/drm/sis_drv.h
@@ -61,9 +61,9 @@ typedef struct drm_sis_private {
61 unsigned long agp_offset; 61 unsigned long agp_offset;
62} drm_sis_private_t; 62} drm_sis_private_t;
63 63
64extern int sis_idle(drm_device_t *dev); 64extern int sis_idle(struct drm_device *dev);
65extern void sis_reclaim_buffers_locked(drm_device_t *dev, struct file *filp); 65extern void sis_reclaim_buffers_locked(struct drm_device *dev, struct file *filp);
66extern void sis_lastclose(drm_device_t *dev); 66extern void sis_lastclose(struct drm_device *dev);
67 67
68extern drm_ioctl_desc_t sis_ioctls[]; 68extern drm_ioctl_desc_t sis_ioctls[];
69extern int sis_max_ioctl; 69extern int sis_max_ioctl;
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 6875a2eda09d..59e7f48da4d3 100644
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -123,7 +123,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS)
123 return 0; 123 return 0;
124} 124}
125 125
126static int sis_drm_alloc(drm_device_t * dev, drm_file_t * priv, 126static int sis_drm_alloc(struct drm_device *dev, struct drm_file * priv,
127 unsigned long data, int pool) 127 unsigned long data, int pool)
128{ 128{
129 drm_sis_private_t *dev_priv = dev->dev_private; 129 drm_sis_private_t *dev_priv = dev->dev_private;
@@ -229,7 +229,7 @@ static int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS)
229 return sis_drm_alloc(dev, priv, data, AGP_TYPE); 229 return sis_drm_alloc(dev, priv, data, AGP_TYPE);
230} 230}
231 231
232static drm_local_map_t *sis_reg_init(drm_device_t *dev) 232static drm_local_map_t *sis_reg_init(struct drm_device *dev)
233{ 233{
234 drm_map_list_t *entry; 234 drm_map_list_t *entry;
235 drm_local_map_t *map; 235 drm_local_map_t *map;
@@ -245,7 +245,7 @@ static drm_local_map_t *sis_reg_init(drm_device_t *dev)
245 return NULL; 245 return NULL;
246} 246}
247 247
248int sis_idle(drm_device_t *dev) 248int sis_idle(struct drm_device *dev)
249{ 249{
250 drm_sis_private_t *dev_priv = dev->dev_private; 250 drm_sis_private_t *dev_priv = dev->dev_private;
251 uint32_t idle_reg; 251 uint32_t idle_reg;
@@ -314,10 +314,10 @@ void sis_lastclose(struct drm_device *dev)
314 mutex_unlock(&dev->struct_mutex); 314 mutex_unlock(&dev->struct_mutex);
315} 315}
316 316
317void sis_reclaim_buffers_locked(drm_device_t * dev, struct file *filp) 317void sis_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
318{ 318{
319 drm_sis_private_t *dev_priv = dev->dev_private; 319 drm_sis_private_t *dev_priv = dev->dev_private;
320 drm_file_t *priv = filp->private_data; 320 struct drm_file *priv = filp->private_data;
321 321
322 mutex_lock(&dev->struct_mutex); 322 mutex_lock(&dev->struct_mutex);
323 if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) { 323 if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) {
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
index 13a9c5ca4593..7ff2b623c2d4 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
@@ -151,7 +151,7 @@ static inline uint32_t *via_check_dma(drm_via_private_t * dev_priv,
151 return (uint32_t *) (dev_priv->dma_ptr + dev_priv->dma_low); 151 return (uint32_t *) (dev_priv->dma_ptr + dev_priv->dma_low);
152} 152}
153 153
154int via_dma_cleanup(drm_device_t * dev) 154int via_dma_cleanup(struct drm_device * dev)
155{ 155{
156 if (dev->dev_private) { 156 if (dev->dev_private) {
157 drm_via_private_t *dev_priv = 157 drm_via_private_t *dev_priv =
@@ -169,7 +169,7 @@ int via_dma_cleanup(drm_device_t * dev)
169 return 0; 169 return 0;
170} 170}
171 171
172static int via_initialize(drm_device_t * dev, 172static int via_initialize(struct drm_device * dev,
173 drm_via_private_t * dev_priv, 173 drm_via_private_t * dev_priv,
174 drm_via_dma_init_t * init) 174 drm_via_dma_init_t * init)
175{ 175{
@@ -262,7 +262,7 @@ static int via_dma_init(DRM_IOCTL_ARGS)
262 return retcode; 262 return retcode;
263} 263}
264 264
265static int via_dispatch_cmdbuffer(drm_device_t * dev, drm_via_cmdbuffer_t * cmd) 265static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t * cmd)
266{ 266{
267 drm_via_private_t *dev_priv; 267 drm_via_private_t *dev_priv;
268 uint32_t *vb; 268 uint32_t *vb;
@@ -316,7 +316,7 @@ static int via_dispatch_cmdbuffer(drm_device_t * dev, drm_via_cmdbuffer_t * cmd)
316 return 0; 316 return 0;
317} 317}
318 318
319int via_driver_dma_quiescent(drm_device_t * dev) 319int via_driver_dma_quiescent(struct drm_device * dev)
320{ 320{
321 drm_via_private_t *dev_priv = dev->dev_private; 321 drm_via_private_t *dev_priv = dev->dev_private;
322 322
@@ -356,7 +356,7 @@ static int via_cmdbuffer(DRM_IOCTL_ARGS)
356 return 0; 356 return 0;
357} 357}
358 358
359static int via_dispatch_pci_cmdbuffer(drm_device_t * dev, 359static int via_dispatch_pci_cmdbuffer(struct drm_device * dev,
360 drm_via_cmdbuffer_t * cmd) 360 drm_via_cmdbuffer_t * cmd)
361{ 361{
362 drm_via_private_t *dev_priv = dev->dev_private; 362 drm_via_private_t *dev_priv = dev->dev_private;
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
index 2881a06b6f55..fdb8609dd76f 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/char/drm/via_dmablit.c
@@ -207,7 +207,7 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg)
207 */ 207 */
208 208
209static void 209static void
210via_fire_dmablit(drm_device_t *dev, drm_via_sg_info_t *vsg, int engine) 210via_fire_dmablit(struct drm_device *dev, drm_via_sg_info_t *vsg, int engine)
211{ 211{
212 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; 212 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
213 213
@@ -289,7 +289,7 @@ via_alloc_desc_pages(drm_via_sg_info_t *vsg)
289} 289}
290 290
291static void 291static void
292via_abort_dmablit(drm_device_t *dev, int engine) 292via_abort_dmablit(struct drm_device *dev, int engine)
293{ 293{
294 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; 294 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
295 295
@@ -297,7 +297,7 @@ via_abort_dmablit(drm_device_t *dev, int engine)
297} 297}
298 298
299static void 299static void
300via_dmablit_engine_off(drm_device_t *dev, int engine) 300via_dmablit_engine_off(struct drm_device *dev, int engine)
301{ 301{
302 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; 302 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
303 303
@@ -314,7 +314,7 @@ via_dmablit_engine_off(drm_device_t *dev, int engine)
314 */ 314 */
315 315
316void 316void
317via_dmablit_handler(drm_device_t *dev, int engine, int from_irq) 317via_dmablit_handler(struct drm_device *dev, int engine, int from_irq)
318{ 318{
319 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; 319 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
320 drm_via_blitq_t *blitq = dev_priv->blit_queues + engine; 320 drm_via_blitq_t *blitq = dev_priv->blit_queues + engine;
@@ -433,7 +433,7 @@ via_dmablit_active(drm_via_blitq_t *blitq, int engine, uint32_t handle, wait_que
433 */ 433 */
434 434
435static int 435static int
436via_dmablit_sync(drm_device_t *dev, uint32_t handle, int engine) 436via_dmablit_sync(struct drm_device *dev, uint32_t handle, int engine)
437{ 437{
438 438
439 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; 439 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
@@ -466,7 +466,7 @@ static void
466via_dmablit_timer(unsigned long data) 466via_dmablit_timer(unsigned long data)
467{ 467{
468 drm_via_blitq_t *blitq = (drm_via_blitq_t *) data; 468 drm_via_blitq_t *blitq = (drm_via_blitq_t *) data;
469 drm_device_t *dev = blitq->dev; 469 struct drm_device *dev = blitq->dev;
470 int engine = (int) 470 int engine = (int)
471 (blitq - ((drm_via_private_t *)dev->dev_private)->blit_queues); 471 (blitq - ((drm_via_private_t *)dev->dev_private)->blit_queues);
472 472
@@ -502,7 +502,7 @@ static void
502via_dmablit_workqueue(struct work_struct *work) 502via_dmablit_workqueue(struct work_struct *work)
503{ 503{
504 drm_via_blitq_t *blitq = container_of(work, drm_via_blitq_t, wq); 504 drm_via_blitq_t *blitq = container_of(work, drm_via_blitq_t, wq);
505 drm_device_t *dev = blitq->dev; 505 struct drm_device *dev = blitq->dev;
506 unsigned long irqsave; 506 unsigned long irqsave;
507 drm_via_sg_info_t *cur_sg; 507 drm_via_sg_info_t *cur_sg;
508 int cur_released; 508 int cur_released;
@@ -545,7 +545,7 @@ via_dmablit_workqueue(struct work_struct *work)
545 545
546 546
547void 547void
548via_init_dmablit(drm_device_t *dev) 548via_init_dmablit(struct drm_device *dev)
549{ 549{
550 int i,j; 550 int i,j;
551 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; 551 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
@@ -582,7 +582,7 @@ via_init_dmablit(drm_device_t *dev)
582 582
583 583
584static int 584static int
585via_build_sg_info(drm_device_t *dev, drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer) 585via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer)
586{ 586{
587 int draw = xfer->to_fb; 587 int draw = xfer->to_fb;
588 int ret = 0; 588 int ret = 0;
@@ -730,7 +730,7 @@ via_dmablit_release_slot(drm_via_blitq_t *blitq)
730 730
731 731
732static int 732static int
733via_dmablit(drm_device_t *dev, drm_via_dmablit_t *xfer) 733via_dmablit(struct drm_device *dev, drm_via_dmablit_t *xfer)
734{ 734{
735 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; 735 drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
736 drm_via_sg_info_t *vsg; 736 drm_via_sg_info_t *vsg;
diff --git a/drivers/char/drm/via_dmablit.h b/drivers/char/drm/via_dmablit.h
index f4036cd5d0e0..6f6a513d5147 100644
--- a/drivers/char/drm/via_dmablit.h
+++ b/drivers/char/drm/via_dmablit.h
@@ -59,7 +59,7 @@ typedef struct _drm_via_sg_info {
59} drm_via_sg_info_t; 59} drm_via_sg_info_t;
60 60
61typedef struct _drm_via_blitq { 61typedef struct _drm_via_blitq {
62 drm_device_t *dev; 62 struct drm_device *dev;
63 uint32_t cur_blit_handle; 63 uint32_t cur_blit_handle;
64 uint32_t done_blit_handle; 64 uint32_t done_blit_handle;
65 unsigned serviced; 65 unsigned serviced;
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
index b46ca8e6306d..11416b956845 100644
--- a/drivers/char/drm/via_drv.h
+++ b/drivers/char/drm/via_drv.h
@@ -123,31 +123,31 @@ extern int via_wait_irq(DRM_IOCTL_ARGS);
123extern int via_dma_blit_sync( DRM_IOCTL_ARGS ); 123extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
124extern int via_dma_blit( DRM_IOCTL_ARGS ); 124extern int via_dma_blit( DRM_IOCTL_ARGS );
125 125
126extern int via_driver_load(drm_device_t *dev, unsigned long chipset); 126extern int via_driver_load(struct drm_device *dev, unsigned long chipset);
127extern int via_driver_unload(drm_device_t *dev); 127extern int via_driver_unload(struct drm_device *dev);
128 128
129extern int via_init_context(drm_device_t * dev, int context); 129extern int via_init_context(struct drm_device * dev, int context);
130extern int via_final_context(drm_device_t * dev, int context); 130extern int via_final_context(struct drm_device * dev, int context);
131 131
132extern int via_do_cleanup_map(drm_device_t * dev); 132extern int via_do_cleanup_map(struct drm_device * dev);
133extern int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence); 133extern int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
134 134
135extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS); 135extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
136extern void via_driver_irq_preinstall(drm_device_t * dev); 136extern void via_driver_irq_preinstall(struct drm_device * dev);
137extern void via_driver_irq_postinstall(drm_device_t * dev); 137extern void via_driver_irq_postinstall(struct drm_device * dev);
138extern void via_driver_irq_uninstall(drm_device_t * dev); 138extern void via_driver_irq_uninstall(struct drm_device * dev);
139 139
140extern int via_dma_cleanup(drm_device_t * dev); 140extern int via_dma_cleanup(struct drm_device * dev);
141extern void via_init_command_verifier(void); 141extern void via_init_command_verifier(void);
142extern int via_driver_dma_quiescent(drm_device_t * dev); 142extern int via_driver_dma_quiescent(struct drm_device * dev);
143extern void via_init_futex(drm_via_private_t * dev_priv); 143extern void via_init_futex(drm_via_private_t * dev_priv);
144extern void via_cleanup_futex(drm_via_private_t * dev_priv); 144extern void via_cleanup_futex(drm_via_private_t * dev_priv);
145extern void via_release_futex(drm_via_private_t * dev_priv, int context); 145extern void via_release_futex(drm_via_private_t * dev_priv, int context);
146 146
147extern void via_reclaim_buffers_locked(drm_device_t *dev, struct file *filp); 147extern void via_reclaim_buffers_locked(struct drm_device *dev, struct file *filp);
148extern void via_lastclose(drm_device_t *dev); 148extern void via_lastclose(struct drm_device *dev);
149 149
150extern void via_dmablit_handler(drm_device_t *dev, int engine, int from_irq); 150extern void via_dmablit_handler(struct drm_device *dev, int engine, int from_irq);
151extern void via_init_dmablit(drm_device_t *dev); 151extern void via_init_dmablit(struct drm_device *dev);
152 152
153#endif 153#endif
diff --git a/drivers/char/drm/via_irq.c b/drivers/char/drm/via_irq.c
index 1ac5941ad237..8dc99b5fbab6 100644
--- a/drivers/char/drm/via_irq.c
+++ b/drivers/char/drm/via_irq.c
@@ -98,7 +98,7 @@ static unsigned time_diff(struct timeval *now, struct timeval *then)
98 98
99irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) 99irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
100{ 100{
101 drm_device_t *dev = (drm_device_t *) arg; 101 struct drm_device *dev = (struct drm_device *) arg;
102 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 102 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
103 u32 status; 103 u32 status;
104 int handled = 0; 104 int handled = 0;
@@ -163,7 +163,7 @@ static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t * dev_priv)
163 } 163 }
164} 164}
165 165
166int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence) 166int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)
167{ 167{
168 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 168 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
169 unsigned int cur_vblank; 169 unsigned int cur_vblank;
@@ -191,7 +191,7 @@ int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence)
191} 191}
192 192
193static int 193static int
194via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence, 194via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequence,
195 unsigned int *sequence) 195 unsigned int *sequence)
196{ 196{
197 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 197 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
@@ -244,7 +244,7 @@ via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
244 * drm_dma.h hooks 244 * drm_dma.h hooks
245 */ 245 */
246 246
247void via_driver_irq_preinstall(drm_device_t * dev) 247void via_driver_irq_preinstall(struct drm_device * dev)
248{ 248{
249 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 249 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
250 u32 status; 250 u32 status;
@@ -293,7 +293,7 @@ void via_driver_irq_preinstall(drm_device_t * dev)
293 } 293 }
294} 294}
295 295
296void via_driver_irq_postinstall(drm_device_t * dev) 296void via_driver_irq_postinstall(struct drm_device * dev)
297{ 297{
298 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 298 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
299 u32 status; 299 u32 status;
@@ -312,7 +312,7 @@ void via_driver_irq_postinstall(drm_device_t * dev)
312 } 312 }
313} 313}
314 314
315void via_driver_irq_uninstall(drm_device_t * dev) 315void via_driver_irq_uninstall(struct drm_device * dev)
316{ 316{
317 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 317 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
318 u32 status; 318 u32 status;
diff --git a/drivers/char/drm/via_map.c b/drivers/char/drm/via_map.c
index dea6390a61f0..7fb9d2a2cce2 100644
--- a/drivers/char/drm/via_map.c
+++ b/drivers/char/drm/via_map.c
@@ -25,7 +25,7 @@
25#include "via_drm.h" 25#include "via_drm.h"
26#include "via_drv.h" 26#include "via_drv.h"
27 27
28static int via_do_init_map(drm_device_t * dev, drm_via_init_t * init) 28static int via_do_init_map(struct drm_device * dev, drm_via_init_t * init)
29{ 29{
30 drm_via_private_t *dev_priv = dev->dev_private; 30 drm_via_private_t *dev_priv = dev->dev_private;
31 31
@@ -68,7 +68,7 @@ static int via_do_init_map(drm_device_t * dev, drm_via_init_t * init)
68 return 0; 68 return 0;
69} 69}
70 70
71int via_do_cleanup_map(drm_device_t * dev) 71int via_do_cleanup_map(struct drm_device * dev)
72{ 72{
73 via_dma_cleanup(dev); 73 via_dma_cleanup(dev);
74 74
@@ -95,7 +95,7 @@ int via_map_init(DRM_IOCTL_ARGS)
95 return -EINVAL; 95 return -EINVAL;
96} 96}
97 97
98int via_driver_load(drm_device_t *dev, unsigned long chipset) 98int via_driver_load(struct drm_device *dev, unsigned long chipset)
99{ 99{
100 drm_via_private_t *dev_priv; 100 drm_via_private_t *dev_priv;
101 int ret = 0; 101 int ret = 0;
@@ -115,7 +115,7 @@ int via_driver_load(drm_device_t *dev, unsigned long chipset)
115 return ret; 115 return ret;
116} 116}
117 117
118int via_driver_unload(drm_device_t *dev) 118int via_driver_unload(struct drm_device *dev)
119{ 119{
120 drm_via_private_t *dev_priv = dev->dev_private; 120 drm_via_private_t *dev_priv = dev->dev_private;
121 121
diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index 2fcf0577a7aa..b609c48d07f2 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -188,10 +188,10 @@ int via_mem_free(DRM_IOCTL_ARGS)
188} 188}
189 189
190 190
191void via_reclaim_buffers_locked(drm_device_t * dev, struct file *filp) 191void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
192{ 192{
193 drm_via_private_t *dev_priv = dev->dev_private; 193 drm_via_private_t *dev_priv = dev->dev_private;
194 drm_file_t *priv = filp->private_data; 194 struct drm_file *priv = filp->private_data;
195 195
196 mutex_lock(&dev->struct_mutex); 196 mutex_lock(&dev->struct_mutex);
197 if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) { 197 if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) {
diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c
index 8b4ea3027b2c..fa3f733e7959 100644
--- a/drivers/char/drm/via_verifier.c
+++ b/drivers/char/drm/via_verifier.c
@@ -252,7 +252,7 @@ eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words)
252static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, 252static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq,
253 unsigned long offset, 253 unsigned long offset,
254 unsigned long size, 254 unsigned long size,
255 drm_device_t * dev) 255 struct drm_device * dev)
256{ 256{
257 drm_map_list_t *r_list; 257 drm_map_list_t *r_list;
258 drm_local_map_t *map = seq->map_cache; 258 drm_local_map_t *map = seq->map_cache;
@@ -962,7 +962,7 @@ via_parse_vheader6(drm_via_private_t * dev_priv, uint32_t const **buffer,
962 962
963int 963int
964via_verify_command_stream(const uint32_t * buf, unsigned int size, 964via_verify_command_stream(const uint32_t * buf, unsigned int size,
965 drm_device_t * dev, int agp) 965 struct drm_device * dev, int agp)
966{ 966{
967 967
968 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 968 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
@@ -1037,7 +1037,7 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
1037} 1037}
1038 1038
1039int 1039int
1040via_parse_command_stream(drm_device_t * dev, const uint32_t * buf, 1040via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
1041 unsigned int size) 1041 unsigned int size)
1042{ 1042{
1043 1043
diff --git a/drivers/char/drm/via_verifier.h b/drivers/char/drm/via_verifier.h
index b77f59df0278..28b50296a7bd 100644
--- a/drivers/char/drm/via_verifier.h
+++ b/drivers/char/drm/via_verifier.h
@@ -47,7 +47,7 @@ typedef struct {
47 drm_via_sequence_t unfinished; 47 drm_via_sequence_t unfinished;
48 int agp_texture; 48 int agp_texture;
49 int multitex; 49 int multitex;
50 drm_device_t *dev; 50 struct drm_device *dev;
51 drm_local_map_t *map_cache; 51 drm_local_map_t *map_cache;
52 uint32_t vertex_count; 52 uint32_t vertex_count;
53 int agp; 53 int agp;
@@ -55,8 +55,8 @@ typedef struct {
55} drm_via_state_t; 55} drm_via_state_t;
56 56
57extern int via_verify_command_stream(const uint32_t * buf, unsigned int size, 57extern int via_verify_command_stream(const uint32_t * buf, unsigned int size,
58 drm_device_t * dev, int agp); 58 struct drm_device * dev, int agp);
59extern int via_parse_command_stream(drm_device_t *dev, const uint32_t *buf, 59extern int via_parse_command_stream(struct drm_device *dev, const uint32_t *buf,
60 unsigned int size); 60 unsigned int size);
61 61
62#endif 62#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-01 16:45:31 -0400