1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 57ce074a559..021a0711485 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -47,7 +47,7 @@
 #define I830_BUF_UNMAPPED 0
 #define I830_BUF_MAPPED   1
 
-static drm_buf_t *i830_freelist_get(struct drm_device * dev)
+static struct drm_buf *i830_freelist_get(struct drm_device * dev)
 {
         drm_device_dma_t *dma = dev->dma;
         int i;
@@ -56,7 +56,7 @@ static drm_buf_t *i830_freelist_get(struct drm_device * dev)
         /* 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(struct drm_device * dev)
  * yet, the hardware updates in use for us once its on the ring buffer.
  */
 
-static int i830_freelist_put(struct drm_device * 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;
@@ -92,7 +92,7 @@ static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
         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,7 +122,7 @@ 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)
 {
         struct drm_file *priv = filp->private_data;
         struct drm_device *dev = priv->head->dev;
@@ -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;
@@ -179,7 +179,7 @@ static int i830_unmap_buffer(drm_buf_t * buf)
 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;
 
@@ -238,7 +238,7 @@ static int i830_dma_cleanup(struct drm_device * 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);
@@ -309,7 +309,7 @@ static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * 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;
 
                 buf_priv->in_use = hw_status++;
@@ -1087,7 +1087,7 @@ static void i830_dma_dispatch_flip(struct drm_device * dev)
 }
 
 static void i830_dma_dispatch_vertex(struct drm_device * dev,
-                                     drm_buf_t * buf, int discard, int used)
+                                     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;
@@ -1232,7 +1232,7 @@ static int i830_flush_queue(struct drm_device * 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,
@@ -1263,7 +1263,7 @@ static void i830_reclaim_buffers(struct drm_device * 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) {