Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: remove core typedefs from the ioc32 wrappers
  drm: remove sarea typedefs
  drm: detypedef the hashtab and more of sman
  drm: de-typedef sman
  drm: detypedeffing continues...
  drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structs
  drm: drop drm_vma_entry_t, drm_magic_entry_t
  drm: drop drm_buf_t typedef
  drm: fixup other drivers for typedef removals
  drm: remove drm_file_t, drm_device_t and drm_head_t typedefs
  drm: remove a bunch of typedefs on the userspace interface
  r300: updates register header
  radeon: add support for vblank on crtc2
  drm: cleanup list initialisation
  drm: fix typo on code drm getsarea
  drm: remove DRM_GETSAREA and replace with drm_getsarea function
  drm: cleanup use of Linux list handling macros

1 files changed, 78 insertions, 79 deletions

diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 3314a9fea9e5..dc20c1a7834e 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -47,16 +47,16 @@
 #define I830_BUF_UNMAPPED 0
 #define I830_BUF_MAPPED   1
 
-static drm_buf_t *i830_freelist_get(drm_device_t * dev)
+static struct drm_buf *i830_freelist_get(struct drm_device * dev)
 {
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         int i;
         int used;
 
         /* Linear search might not be the best solution */
 
         for (i = 0; i < dma->buf_count; i++) {
-                drm_buf_t *buf = dma->buflist[i];
+                struct drm_buf *buf = dma->buflist[i];
                 drm_i830_buf_priv_t *buf_priv = buf->dev_private;
                 /* In use is already a pointer */
                 used = cmpxchg(buf_priv->in_use, I830_BUF_FREE,
@@ -72,7 +72,7 @@ static drm_buf_t *i830_freelist_get(drm_device_t * dev)
  * yet, the hardware updates in use for us once its on the ring buffer.
  */
 
-static int i830_freelist_put(drm_device_t * dev, drm_buf_t * buf)
+static int i830_freelist_put(struct drm_device * dev, struct drm_buf * buf)
 {
         drm_i830_buf_priv_t *buf_priv = buf->dev_private;
         int used;
@@ -89,10 +89,10 @@ static int i830_freelist_put(drm_device_t * dev, drm_buf_t * buf)
 
 static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev;
         drm_i830_private_t *dev_priv;
-        drm_buf_t *buf;
+        struct drm_buf *buf;
         drm_i830_buf_priv_t *buf_priv;
 
         lock_kernel();
@@ -122,10 +122,10 @@ static const struct file_operations i830_buffer_fops = {
         .fasync = drm_fasync,
 };
 
-static int i830_map_buffer(drm_buf_t * buf, struct file *filp)
+static int i830_map_buffer(struct drm_buf * buf, struct file *filp)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_i830_buf_priv_t *buf_priv = buf->dev_private;
         drm_i830_private_t *dev_priv = dev->dev_private;
         const struct file_operations *old_fops;
@@ -156,7 +156,7 @@ static int i830_map_buffer(drm_buf_t * buf, struct file *filp)
         return retcode;
 }
 
-static int i830_unmap_buffer(drm_buf_t * buf)
+static int i830_unmap_buffer(struct drm_buf * buf)
 {
         drm_i830_buf_priv_t *buf_priv = buf->dev_private;
         int retcode = 0;
@@ -176,10 +176,10 @@ static int i830_unmap_buffer(drm_buf_t * buf)
         return retcode;
 }
 
-static int i830_dma_get_buffer(drm_device_t * dev, drm_i830_dma_t * d,
+static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d,
                                struct file *filp)
 {
-        drm_buf_t *buf;
+        struct drm_buf *buf;
         drm_i830_buf_priv_t *buf_priv;
         int retcode = 0;
 
@@ -206,9 +206,9 @@ static int i830_dma_get_buffer(drm_device_t * dev, drm_i830_dma_t * d,
         return retcode;
 }
 
-static int i830_dma_cleanup(drm_device_t * dev)
+static int i830_dma_cleanup(struct drm_device * dev)
 {
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
 
         /* Make sure interrupts are disabled here because the uninstall ioctl
          * may not have been called from userspace and after dev_private
@@ -238,7 +238,7 @@ static int i830_dma_cleanup(drm_device_t * dev)
                 dev->dev_private = NULL;
 
                 for (i = 0; i < dma->buf_count; i++) {
-                        drm_buf_t *buf = dma->buflist[i];
+                        struct drm_buf *buf = dma->buflist[i];
                         drm_i830_buf_priv_t *buf_priv = buf->dev_private;
                         if (buf_priv->kernel_virtual && buf->total)
                                 drm_core_ioremapfree(&buf_priv->map, dev);
@@ -247,7 +247,7 @@ static int i830_dma_cleanup(drm_device_t * dev)
         return 0;
 }
 
-int i830_wait_ring(drm_device_t * dev, int n, const char *caller)
+int i830_wait_ring(struct drm_device * dev, int n, const char *caller)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
@@ -281,7 +281,7 @@ int i830_wait_ring(drm_device_t * dev, int n, const char *caller)
         return iters;
 }
 
-static void i830_kernel_lost_context(drm_device_t * dev)
+static void i830_kernel_lost_context(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
@@ -296,9 +296,9 @@ static void i830_kernel_lost_context(drm_device_t * dev)
                 dev_priv->sarea_priv->perf_boxes |= I830_BOX_RING_EMPTY;
 }
 
-static int i830_freelist_init(drm_device_t * dev, drm_i830_private_t * dev_priv)
+static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv)
 {
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         int my_idx = 36;
         u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx);
         int i;
@@ -309,7 +309,7 @@ static int i830_freelist_init(drm_device_t * dev, drm_i830_private_t * dev_priv)
         }
 
         for (i = 0; i < dma->buf_count; i++) {
-                drm_buf_t *buf = dma->buflist[i];
+                struct drm_buf *buf = dma->buflist[i];
                 drm_i830_buf_priv_t *buf_priv = buf->dev_private;
 
                 buf_priv->in_use = hw_status++;
@@ -330,16 +330,15 @@ static int i830_freelist_init(drm_device_t * dev, drm_i830_private_t * dev_priv)
         return 0;
 }
 
-static int i830_dma_initialize(drm_device_t * dev,
+static int i830_dma_initialize(struct drm_device * dev,
                                drm_i830_private_t * dev_priv,
                                drm_i830_init_t * init)
 {
-        struct list_head *list;
+        struct drm_map_list *r_list;
 
         memset(dev_priv, 0, sizeof(drm_i830_private_t));
 
-        list_for_each(list, &dev->maplist->head) {
-                drm_map_list_t *r_list = list_entry(list, drm_map_list_t, head);
+        list_for_each_entry(r_list, &dev->maplist, head) {
                 if (r_list->map &&
                     r_list->map->type == _DRM_SHM &&
                     r_list->map->flags & _DRM_CONTAINS_LOCK) {
@@ -455,8 +454,8 @@ static int i830_dma_initialize(drm_device_t * dev,
 static int i830_dma_init(struct inode *inode, struct file *filp,
                          unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_i830_private_t *dev_priv;
         drm_i830_init_t init;
         int retcode = 0;
@@ -490,7 +489,7 @@ static int i830_dma_init(struct inode *inode, struct file *filp,
 /* Most efficient way to verify state for the i830 is as it is
  * emitted.  Non-conformant state is silently dropped.
  */
-static void i830EmitContextVerified(drm_device_t * dev, unsigned int *code)
+static void i830EmitContextVerified(struct drm_device * dev, unsigned int *code)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         int i, j = 0;
@@ -535,7 +534,7 @@ static void i830EmitContextVerified(drm_device_t * dev, unsigned int *code)
         ADVANCE_LP_RING();
 }
 
-static void i830EmitTexVerified(drm_device_t * dev, unsigned int *code)
+static void i830EmitTexVerified(struct drm_device * dev, unsigned int *code)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         int i, j = 0;
@@ -569,7 +568,7 @@ static void i830EmitTexVerified(drm_device_t * dev, unsigned int *code)
                 printk("rejected packet %x\n", code[0]);
 }
 
-static void i830EmitTexBlendVerified(drm_device_t * dev,
+static void i830EmitTexBlendVerified(struct drm_device * dev,
                                      unsigned int *code, unsigned int num)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
@@ -594,7 +593,7 @@ static void i830EmitTexBlendVerified(drm_device_t * dev,
         ADVANCE_LP_RING();
 }
 
-static void i830EmitTexPalette(drm_device_t * dev,
+static void i830EmitTexPalette(struct drm_device * dev,
                                unsigned int *palette, int number, int is_shared)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
@@ -621,7 +620,7 @@ static void i830EmitTexPalette(drm_device_t * dev,
 
 /* Need to do some additional checking when setting the dest buffer.
  */
-static void i830EmitDestVerified(drm_device_t * dev, unsigned int *code)
+static void i830EmitDestVerified(struct drm_device * dev, unsigned int *code)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         unsigned int tmp;
@@ -682,7 +681,7 @@ static void i830EmitDestVerified(drm_device_t * dev, unsigned int *code)
         ADVANCE_LP_RING();
 }
 
-static void i830EmitStippleVerified(drm_device_t * dev, unsigned int *code)
+static void i830EmitStippleVerified(struct drm_device * dev, unsigned int *code)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         RING_LOCALS;
@@ -693,7 +692,7 @@ static void i830EmitStippleVerified(drm_device_t * dev, unsigned int *code)
         ADVANCE_LP_RING();
 }
 
-static void i830EmitState(drm_device_t * dev)
+static void i830EmitState(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -796,7 +795,7 @@ static void i830EmitState(drm_device_t * dev)
  * Performance monitoring functions
  */
 
-static void i830_fill_box(drm_device_t * dev,
+static void i830_fill_box(struct drm_device * dev,
                           int x, int y, int w, int h, int r, int g, int b)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
@@ -834,7 +833,7 @@ static void i830_fill_box(drm_device_t * dev,
         ADVANCE_LP_RING();
 }
 
-static void i830_cp_performance_boxes(drm_device_t * dev)
+static void i830_cp_performance_boxes(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
 
@@ -879,7 +878,7 @@ static void i830_cp_performance_boxes(drm_device_t * dev)
         dev_priv->sarea_priv->perf_boxes = 0;
 }
 
-static void i830_dma_dispatch_clear(drm_device_t * dev, int flags,
+static void i830_dma_dispatch_clear(struct drm_device * dev, int flags,
                                     unsigned int clear_color,
                                     unsigned int clear_zval,
                                     unsigned int clear_depthmask)
@@ -887,7 +886,7 @@ static void i830_dma_dispatch_clear(drm_device_t * dev, int flags,
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
         int nbox = sarea_priv->nbox;
-        drm_clip_rect_t *pbox = sarea_priv->boxes;
+        struct drm_clip_rect *pbox = sarea_priv->boxes;
         int pitch = dev_priv->pitch;
         int cpp = dev_priv->cpp;
         int i;
@@ -974,12 +973,12 @@ static void i830_dma_dispatch_clear(drm_device_t * dev, int flags,
         }
 }
 
-static void i830_dma_dispatch_swap(drm_device_t * dev)
+static void i830_dma_dispatch_swap(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
         int nbox = sarea_priv->nbox;
-        drm_clip_rect_t *pbox = sarea_priv->boxes;
+        struct drm_clip_rect *pbox = sarea_priv->boxes;
         int pitch = dev_priv->pitch;
         int cpp = dev_priv->cpp;
         int i;
@@ -1044,7 +1043,7 @@ static void i830_dma_dispatch_swap(drm_device_t * dev)
         }
 }
 
-static void i830_dma_dispatch_flip(drm_device_t * dev)
+static void i830_dma_dispatch_flip(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         RING_LOCALS;
@@ -1087,13 +1086,13 @@ static void i830_dma_dispatch_flip(drm_device_t * dev)
         dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
 }
 
-static void i830_dma_dispatch_vertex(drm_device_t * dev,
-                                     drm_buf_t * buf, int discard, int used)
+static void i830_dma_dispatch_vertex(struct drm_device * dev,
+                                     struct drm_buf * buf, int discard, int used)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_buf_priv_t *buf_priv = buf->dev_private;
         drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
-        drm_clip_rect_t *box = sarea_priv->boxes;
+        struct drm_clip_rect *box = sarea_priv->boxes;
         int nbox = sarea_priv->nbox;
         unsigned long address = (unsigned long)buf->bus_address;
         unsigned long start = address - dev->agp->base;
@@ -1199,7 +1198,7 @@ static void i830_dma_dispatch_vertex(drm_device_t * dev,
         }
 }
 
-static void i830_dma_quiescent(drm_device_t * dev)
+static void i830_dma_quiescent(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
         RING_LOCALS;
@@ -1216,10 +1215,10 @@ static void i830_dma_quiescent(drm_device_t * dev)
         i830_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);
 }
 
-static int i830_flush_queue(drm_device_t * dev)
+static int i830_flush_queue(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         int i, ret = 0;
         RING_LOCALS;
 
@@ -1233,7 +1232,7 @@ static int i830_flush_queue(drm_device_t * dev)
         i830_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);
 
         for (i = 0; i < dma->buf_count; i++) {
-                drm_buf_t *buf = dma->buflist[i];
+                struct drm_buf *buf = dma->buflist[i];
                 drm_i830_buf_priv_t *buf_priv = buf->dev_private;
 
                 int used = cmpxchg(buf_priv->in_use, I830_BUF_HARDWARE,
@@ -1249,9 +1248,9 @@ static int i830_flush_queue(drm_device_t * dev)
 }
 
 /* Must be called with the lock held */
-static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
+static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp)
 {
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         int i;
 
         if (!dma)
@@ -1264,7 +1263,7 @@ static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
         i830_flush_queue(dev);
 
         for (i = 0; i < dma->buf_count; i++) {
-                drm_buf_t *buf = dma->buflist[i];
+                struct drm_buf *buf = dma->buflist[i];
                 drm_i830_buf_priv_t *buf_priv = buf->dev_private;
 
                 if (buf->filp == filp && buf_priv) {
@@ -1282,8 +1281,8 @@ static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
 static int i830_flush_ioctl(struct inode *inode, struct file *filp,
                             unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
 
         LOCK_TEST_WITH_RETURN(dev, filp);
 
@@ -1294,9 +1293,9 @@ static int i830_flush_ioctl(struct inode *inode, struct file *filp,
 static int i830_dma_vertex(struct inode *inode, struct file *filp,
                            unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
+        struct drm_device_dma *dma = dev->dma;
         drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
         u32 *hw_status = dev_priv->hw_status_page;
         drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *)
@@ -1328,8 +1327,8 @@ static int i830_dma_vertex(struct inode *inode, struct file *filp,
 static int i830_clear_bufs(struct inode *inode, struct file *filp,
                            unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_i830_clear_t clear;
 
         if (copy_from_user
@@ -1352,8 +1351,8 @@ static int i830_clear_bufs(struct inode *inode, struct file *filp,
 static int i830_swap_bufs(struct inode *inode, struct file *filp,
                           unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
 
         DRM_DEBUG("i830_swap_bufs\n");
 
@@ -1365,7 +1364,7 @@ static int i830_swap_bufs(struct inode *inode, struct file *filp,
 
 /* Not sure why this isn't set all the time:
  */
-static void i830_do_init_pageflip(drm_device_t * dev)
+static void i830_do_init_pageflip(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
 
@@ -1375,7 +1374,7 @@ static void i830_do_init_pageflip(drm_device_t * dev)
         dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
 }
 
-static int i830_do_cleanup_pageflip(drm_device_t * dev)
+static int i830_do_cleanup_pageflip(struct drm_device * dev)
 {
         drm_i830_private_t *dev_priv = dev->dev_private;
 
@@ -1390,8 +1389,8 @@ static int i830_do_cleanup_pageflip(drm_device_t * dev)
 static int i830_flip_bufs(struct inode *inode, struct file *filp,
                           unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_i830_private_t *dev_priv = dev->dev_private;
 
         DRM_DEBUG("%s\n", __FUNCTION__);
@@ -1408,8 +1407,8 @@ static int i830_flip_bufs(struct inode *inode, struct file *filp,
 static int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
                        unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
         u32 *hw_status = dev_priv->hw_status_page;
         drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *)
@@ -1422,8 +1421,8 @@ static int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
 static int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
                        unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         int retcode = 0;
         drm_i830_dma_t d;
         drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
@@ -1444,7 +1443,7 @@ static int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
         DRM_DEBUG("i830_dma: %d returning %d, granted = %d\n",
                   current->pid, retcode, d.granted);
 
-        if (copy_to_user((drm_dma_t __user *) arg, &d, sizeof(d)))
+        if (copy_to_user((void __user *) arg, &d, sizeof(d)))
                 return -EFAULT;
         sarea_priv->last_dispatch = (int)hw_status[5];
 
@@ -1467,8 +1466,8 @@ static int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
 static int i830_getparam(struct inode *inode, struct file *filp,
                          unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_getparam_t param;
         int value;
@@ -1501,8 +1500,8 @@ static int i830_getparam(struct inode *inode, struct file *filp,
 static int i830_setparam(struct inode *inode, struct file *filp,
                          unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_i830_private_t *dev_priv = dev->dev_private;
         drm_i830_setparam_t param;
 
@@ -1526,7 +1525,7 @@ static int i830_setparam(struct inode *inode, struct file *filp,
         return 0;
 }
 
-int i830_driver_load(drm_device_t *dev, unsigned long flags)
+int i830_driver_load(struct drm_device *dev, unsigned long flags)
 {
         /* i830 has 4 more counters */
         dev->counters += 4;
@@ -1538,12 +1537,12 @@ int i830_driver_load(drm_device_t *dev, unsigned long flags)
         return 0;
 }
 
-void i830_driver_lastclose(drm_device_t * dev)
+void i830_driver_lastclose(struct drm_device * dev)
 {
         i830_dma_cleanup(dev);
 }
 
-void i830_driver_preclose(drm_device_t * dev, DRMFILE filp)
+void i830_driver_preclose(struct drm_device * dev, DRMFILE filp)
 {
         if (dev->dev_private) {
                 drm_i830_private_t *dev_priv = dev->dev_private;
@@ -1553,12 +1552,12 @@ void i830_driver_preclose(drm_device_t * dev, DRMFILE filp)
         }
 }
 
-void i830_driver_reclaim_buffers_locked(drm_device_t * dev, struct file *filp)
+void i830_driver_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
 {
         i830_reclaim_buffers(dev, filp);
 }
 
-int i830_driver_dma_quiescent(drm_device_t * dev)
+int i830_driver_dma_quiescent(struct drm_device * dev)
 {
         i830_dma_quiescent(dev);
         return 0;
@@ -1594,7 +1593,7 @@ int i830_max_ioctl = DRM_ARRAY_SIZE(i830_ioctls);
  * \returns
  * A value of 1 is always retured to indictate every i8xx is AGP.
  */
-int i830_driver_device_is_agp(drm_device_t * dev)
+int i830_driver_device_is_agp(struct drm_device * dev)
 {
         return 1;
 }