1 files changed, 31 insertions, 31 deletions

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 @@
 
 static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
                                                     dev_priv,
-                                                    drm_file_t * filp_priv,
+                                                    struct drm_file * filp_priv,
                                                     u32 *offset)
 {
         u64 off = *offset;
@@ -90,7 +90,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
 
 static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
                                                      dev_priv,
-                                                     drm_file_t * filp_priv,
+                                                     struct drm_file * filp_priv,
                                                      int id, u32 *data)
 {
         switch (id) {
@@ -264,7 +264,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
 
 static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                                                      dev_priv,
-                                                     drm_file_t *filp_priv,
+                                                     struct drm_file *filp_priv,
                                                      drm_radeon_kcmd_buffer_t *
                                                      cmdbuf,
                                                      unsigned int *cmdsz)
@@ -439,7 +439,7 @@ static __inline__ void radeon_emit_clip_rect(drm_radeon_private_t * dev_priv,
 /* Emit 1.1 state
  */
 static int radeon_emit_state(drm_radeon_private_t * dev_priv,
-                             drm_file_t * filp_priv,
+                             struct drm_file * filp_priv,
                              drm_radeon_context_regs_t * ctx,
                              drm_radeon_texture_regs_t * tex,
                              unsigned int dirty)
@@ -608,7 +608,7 @@ static int radeon_emit_state(drm_radeon_private_t * dev_priv,
 /* Emit 1.2 state
  */
 static int radeon_emit_state2(drm_radeon_private_t * dev_priv,
-                              drm_file_t * filp_priv,
+                              struct drm_file * filp_priv,
                               drm_radeon_state_t * state)
 {
         RING_LOCALS;
@@ -844,7 +844,7 @@ static void radeon_cp_performance_boxes(drm_radeon_private_t * dev_priv)
  * CP command dispatch functions
  */
 
-static void radeon_cp_dispatch_clear(drm_device_t * dev,
+static void radeon_cp_dispatch_clear(struct drm_device * dev,
                                      drm_radeon_clear_t * clear,
                                      drm_radeon_clear_rect_t * depth_boxes)
 {
@@ -1335,7 +1335,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev,
         ADVANCE_RING();
 }
 
-static void radeon_cp_dispatch_swap(drm_device_t * dev)
+static void radeon_cp_dispatch_swap(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -1412,7 +1412,7 @@ static void radeon_cp_dispatch_swap(drm_device_t * dev)
         ADVANCE_RING();
 }
 
-static void radeon_cp_dispatch_flip(drm_device_t * dev)
+static void radeon_cp_dispatch_flip(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_sarea_t *sarea = (drm_sarea_t *) dev_priv->sarea->handle;
@@ -1491,7 +1491,7 @@ typedef struct {
         unsigned int vc_format;
 } drm_radeon_tcl_prim_t;
 
-static void radeon_cp_dispatch_vertex(drm_device_t * dev,
+static void radeon_cp_dispatch_vertex(struct drm_device * dev,
                                       drm_buf_t * buf,
                                       drm_radeon_tcl_prim_t * prim)
 {
@@ -1537,7 +1537,7 @@ static void radeon_cp_dispatch_vertex(drm_device_t * dev,
         } while (i < nbox);
 }
 
-static void radeon_cp_discard_buffer(drm_device_t * dev, drm_buf_t * buf)
+static void radeon_cp_discard_buffer(struct drm_device * dev, drm_buf_t * buf)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         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)
         buf->used = 0;
 }
 
-static void radeon_cp_dispatch_indirect(drm_device_t * dev,
+static void radeon_cp_dispatch_indirect(struct drm_device * dev,
                                         drm_buf_t * buf, int start, int end)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -1588,7 +1588,7 @@ static void radeon_cp_dispatch_indirect(drm_device_t * dev,
         }
 }
 
-static void radeon_cp_dispatch_indices(drm_device_t * dev,
+static void radeon_cp_dispatch_indices(struct drm_device * dev,
                                        drm_buf_t * elt_buf,
                                        drm_radeon_tcl_prim_t * prim)
 {
@@ -1647,12 +1647,12 @@ static void radeon_cp_dispatch_indices(drm_device_t * dev,
 #define RADEON_MAX_TEXTURE_SIZE RADEON_BUFFER_SIZE
 
 static int radeon_cp_dispatch_texture(DRMFILE filp,
-                                      drm_device_t * dev,
+                                      struct drm_device * dev,
                                       drm_radeon_texture_t * tex,
                                       drm_radeon_tex_image_t * image)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_file_t *filp_priv;
+        struct drm_file *filp_priv;
         drm_buf_t *buf;
         u32 format;
         u32 *buffer;
@@ -1881,7 +1881,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
         return 0;
 }
 
-static void radeon_cp_dispatch_stipple(drm_device_t * dev, u32 * stipple)
+static void radeon_cp_dispatch_stipple(struct drm_device * dev, u32 * stipple)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         int i;
@@ -2134,7 +2134,7 @@ static int radeon_cp_clear(DRM_IOCTL_ARGS)
 
 /* Not sure why this isn't set all the time:
  */
-static int radeon_do_init_pageflip(drm_device_t * dev)
+static int radeon_do_init_pageflip(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         RING_LOCALS;
@@ -2206,7 +2206,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_file_t *filp_priv;
+        struct drm_file *filp_priv;
         drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
         drm_device_dma_t *dma = dev->dma;
         drm_buf_t *buf;
@@ -2289,7 +2289,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_file_t *filp_priv;
+        struct drm_file *filp_priv;
         drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
         drm_device_dma_t *dma = dev->dma;
         drm_buf_t *buf;
@@ -2507,7 +2507,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_file_t *filp_priv;
+        struct drm_file *filp_priv;
         drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
         drm_device_dma_t *dma = dev->dma;
         drm_buf_t *buf;
@@ -2603,7 +2603,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
 }
 
 static int radeon_emit_packets(drm_radeon_private_t * dev_priv,
-                               drm_file_t * filp_priv,
+                               struct drm_file * filp_priv,
                                drm_radeon_cmd_header_t header,
                                drm_radeon_kcmd_buffer_t *cmdbuf)
 {
@@ -2728,8 +2728,8 @@ static __inline__ int radeon_emit_veclinear(drm_radeon_private_t *dev_priv,
         return 0;
 }
 
-static int radeon_emit_packet3(drm_device_t * dev,
-                               drm_file_t * filp_priv,
+static int radeon_emit_packet3(struct drm_device * dev,
+                               struct drm_file * filp_priv,
                                drm_radeon_kcmd_buffer_t *cmdbuf)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -2754,8 +2754,8 @@ static int radeon_emit_packet3(drm_device_t * dev,
         return 0;
 }
 
-static int radeon_emit_packet3_cliprect(drm_device_t *dev,
-                                        drm_file_t *filp_priv,
+static int radeon_emit_packet3_cliprect(struct drm_device *dev,
+                                        struct drm_file *filp_priv,
                                         drm_radeon_kcmd_buffer_t *cmdbuf,
                                         int orig_nbox)
 {
@@ -2816,7 +2816,7 @@ static int radeon_emit_packet3_cliprect(drm_device_t *dev,
         return 0;
 }
 
-static int radeon_emit_wait(drm_device_t * dev, int flags)
+static int radeon_emit_wait(struct drm_device * dev, int flags)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         RING_LOCALS;
@@ -2849,7 +2849,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_file_t *filp_priv;
+        struct drm_file *filp_priv;
         drm_device_dma_t *dma = dev->dma;
         drm_buf_t *buf = NULL;
         int idx;
@@ -3105,7 +3105,7 @@ static int radeon_cp_setparam(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_file_t *filp_priv;
+        struct drm_file *filp_priv;
         drm_radeon_setparam_t sp;
         struct drm_radeon_driver_file_fields *radeon_priv;
 
@@ -3162,7 +3162,7 @@ static int radeon_cp_setparam(DRM_IOCTL_ARGS)
  *
  * DRM infrastructure takes care of reclaiming dma buffers.
  */
-void radeon_driver_preclose(drm_device_t * dev, DRMFILE filp)
+void radeon_driver_preclose(struct drm_device *dev, DRMFILE filp)
 {
         if (dev->dev_private) {
                 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -3173,7 +3173,7 @@ void radeon_driver_preclose(drm_device_t * dev, DRMFILE filp)
         }
 }
 
-void radeon_driver_lastclose(drm_device_t * dev)
+void radeon_driver_lastclose(struct drm_device *dev)
 {
         if (dev->dev_private) {
                 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -3186,7 +3186,7 @@ void radeon_driver_lastclose(drm_device_t * dev)
         radeon_do_release(dev);
 }
 
-int radeon_driver_open(drm_device_t * dev, drm_file_t * filp_priv)
+int radeon_driver_open(struct drm_device *dev, struct drm_file *filp_priv)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         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)
         return 0;
 }
 
-void radeon_driver_postclose(drm_device_t * dev, drm_file_t * filp_priv)
+void radeon_driver_postclose(struct drm_device *dev, struct drm_file *filp_priv)
 {
         struct drm_radeon_driver_file_fields *radeon_priv =
             filp_priv->driver_priv;