1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index ca82cddb4a22..b4a98fa2e2d4 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -45,7 +45,7 @@
 #define I810_BUF_UNMAPPED 0
 #define I810_BUF_MAPPED   1
 
-static drm_buf_t *i810_freelist_get(struct drm_device * dev)
+static struct drm_buf *i810_freelist_get(struct drm_device * dev)
 {
         drm_device_dma_t *dma = dev->dma;
         int i;
@@ -54,7 +54,7 @@ static drm_buf_t *i810_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_i810_buf_priv_t *buf_priv = buf->dev_private;
                 /* In use is already a pointer */
                 used = cmpxchg(buf_priv->in_use, I810_BUF_FREE,
@@ -70,7 +70,7 @@ static drm_buf_t *i810_freelist_get(struct drm_device * dev)
  * yet, the hardware updates in use for us once its on the ring buffer.
  */
 
-static int i810_freelist_put(struct drm_device * dev, drm_buf_t * buf)
+static int i810_freelist_put(struct drm_device * dev, struct drm_buf * buf)
 {
         drm_i810_buf_priv_t *buf_priv = buf->dev_private;
         int used;
@@ -90,7 +90,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
         struct drm_file *priv = filp->private_data;
         struct drm_device *dev;
         drm_i810_private_t *dev_priv;
-        drm_buf_t *buf;
+        struct drm_buf *buf;
         drm_i810_buf_priv_t *buf_priv;
 
         lock_kernel();
@@ -120,7 +120,7 @@ static const struct file_operations i810_buffer_fops = {
         .fasync = drm_fasync,
 };
 
-static int i810_map_buffer(drm_buf_t * buf, struct file *filp)
+static int i810_map_buffer(struct drm_buf * buf, struct file *filp)
 {
         struct drm_file *priv = filp->private_data;
         struct drm_device *dev = priv->head->dev;
@@ -152,7 +152,7 @@ static int i810_map_buffer(drm_buf_t * buf, struct file *filp)
         return retcode;
 }
 
-static int i810_unmap_buffer(drm_buf_t * buf)
+static int i810_unmap_buffer(struct drm_buf * buf)
 {
         drm_i810_buf_priv_t *buf_priv = buf->dev_private;
         int retcode = 0;
@@ -175,7 +175,7 @@ static int i810_unmap_buffer(drm_buf_t * buf)
 static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
                                struct file *filp)
 {
-        drm_buf_t *buf;
+        struct drm_buf *buf;
         drm_i810_buf_priv_t *buf_priv;
         int retcode = 0;
 
@@ -233,7 +233,7 @@ static int i810_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_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                         if (buf_priv->kernel_virtual && buf->total)
@@ -301,7 +301,7 @@ static int i810_freelist_init(struct drm_device * dev, drm_i810_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_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                 buf_priv->in_use = hw_status++;
@@ -788,7 +788,7 @@ static void i810_dma_dispatch_swap(struct drm_device * dev)
 }
 
 static void i810_dma_dispatch_vertex(struct drm_device * dev,
-                                     drm_buf_t * buf, int discard, int used)
+                                     struct drm_buf * buf, int discard, int used)
 {
         drm_i810_private_t *dev_priv = dev->dev_private;
         drm_i810_buf_priv_t *buf_priv = buf->dev_private;
@@ -952,7 +952,7 @@ static int i810_flush_queue(struct drm_device * dev)
         i810_wait_ring(dev, dev_priv->ring.Size - 8);
 
         for (i = 0; i < dma->buf_count; i++) {
-                drm_buf_t *buf = dma->buflist[i];
+                struct drm_buf *buf = dma->buflist[i];
                 drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                 int used = cmpxchg(buf_priv->in_use, I810_BUF_HARDWARE,
@@ -983,7 +983,7 @@ static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp)
         i810_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_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                 if (buf->filp == filp && buf_priv) {
@@ -1142,7 +1142,7 @@ static int i810_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
         return 0;
 }
 
-static void i810_dma_dispatch_mc(struct drm_device * dev, drm_buf_t * buf, int used,
+static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf, int used,
                                  unsigned int last_render)
 {
         drm_i810_private_t *dev_priv = dev->dev_private;