drm: remove a bunch of typedefs on the userspace interface

This moves a bunch of typedefs into a !defined __KERNEL__ to keep userspace
API compatiblity, it changes all internal usages to structs/enum/unions.

Signed-off-by: Dave Airlie <airlied@linux.ie>

25 files changed, 367 insertions, 320 deletions

diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
index 089198491f16..2d6f2d0bd02b 100644
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
@@ -109,31 +109,31 @@ typedef unsigned int drm_magic_t;
  * \note KW: Actually it's illegal to change either for
  * backwards-compatibility reasons.
  */
-typedef struct drm_clip_rect {
+struct drm_clip_rect {
         unsigned short x1;
         unsigned short y1;
         unsigned short x2;
         unsigned short y2;
-} drm_clip_rect_t;
+};
 
 /**
  * Drawable information.
  */
-typedef struct drm_drawable_info {
+struct drm_drawable_info {
         unsigned int num_rects;
-        drm_clip_rect_t *rects;
-} drm_drawable_info_t;
+        struct drm_clip_rect *rects;
+};
 
 /**
  * Texture region,
  */
-typedef struct drm_tex_region {
+struct drm_tex_region {
         unsigned char next;
         unsigned char prev;
         unsigned char in_use;
         unsigned char padding;
         unsigned int age;
-} drm_tex_region_t;
+};
 
 /**
  * Hardware lock.
@@ -142,17 +142,17 @@ typedef struct drm_tex_region {
  * processor bus contention on a multiprocessor system, there should not be any
  * other data stored in the same cache line.
  */
-typedef struct drm_hw_lock {
+struct drm_hw_lock {
         __volatile__ unsigned int lock;         /**< lock variable */
         char padding[60];                       /**< Pad to cache line */
-} drm_hw_lock_t;
+};
 
 /**
  * DRM_IOCTL_VERSION ioctl argument type.
  *
  * \sa drmGetVersion().
  */
-typedef struct drm_version {
+struct drm_version {
         int version_major;        /**< Major version */
         int version_minor;        /**< Minor version */
         int version_patchlevel;   /**< Patch level */
@@ -162,33 +162,33 @@ typedef struct drm_version {
         char __user *date;        /**< User-space buffer to hold date */
         size_t desc_len;          /**< Length of desc buffer */
         char __user *desc;        /**< User-space buffer to hold desc */
-} drm_version_t;
+};
 
 /**
  * DRM_IOCTL_GET_UNIQUE ioctl argument type.
  *
  * \sa drmGetBusid() and drmSetBusId().
  */
-typedef struct drm_unique {
+struct drm_unique {
         size_t unique_len;        /**< Length of unique */
         char __user *unique;      /**< Unique name for driver instantiation */
-} drm_unique_t;
+};
 
-typedef struct drm_list {
+struct drm_list {
         int count;                /**< Length of user-space structures */
-        drm_version_t __user *version;
-} drm_list_t;
+        struct drm_version __user *version;
+};
 
-typedef struct drm_block {
+struct drm_block {
         int unused;
-} drm_block_t;
+};
 
 /**
  * DRM_IOCTL_CONTROL ioctl argument type.
  *
  * \sa drmCtlInstHandler() and drmCtlUninstHandler().
  */
-typedef struct drm_control {
+struct drm_control {
         enum {
                 DRM_ADD_COMMAND,
                 DRM_RM_COMMAND,
@@ -196,24 +196,24 @@ typedef struct drm_control {
                 DRM_UNINST_HANDLER
         } func;
         int irq;
-} drm_control_t;
+};
 
 /**
  * Type of memory to map.
  */
-typedef enum drm_map_type {
+enum drm_map_type {
         _DRM_FRAME_BUFFER = 0,    /**< WC (no caching), no core dump */
         _DRM_REGISTERS = 1,       /**< no caching, no core dump */
         _DRM_SHM = 2,             /**< shared, cached */
         _DRM_AGP = 3,             /**< AGP/GART */
         _DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
         _DRM_CONSISTENT = 5,      /**< Consistent memory for PCI DMA */
-} drm_map_type_t;
+};
 
 /**
  * Memory mapping flags.
  */
-typedef enum drm_map_flags {
+enum drm_map_flags {
         _DRM_RESTRICTED = 0x01,      /**< Cannot be mapped to user-virtual */
         _DRM_READ_ONLY = 0x02,
         _DRM_LOCKED = 0x04,          /**< shared, cached, locked */
@@ -221,12 +221,12 @@ typedef enum drm_map_flags {
         _DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */
         _DRM_CONTAINS_LOCK = 0x20,   /**< SHM page that contains lock */
         _DRM_REMOVABLE = 0x40        /**< Removable mapping */
-} drm_map_flags_t;
+};
 
-typedef struct drm_ctx_priv_map {
+struct drm_ctx_priv_map {
         unsigned int ctx_id;     /**< Context requesting private mapping */
         void *handle;            /**< Handle of map */
-} drm_ctx_priv_map_t;
+};
 
 /**
  * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls
@@ -234,30 +234,30 @@ typedef struct drm_ctx_priv_map {
  *
  * \sa drmAddMap().
  */
-typedef struct drm_map {
+struct drm_map {
         unsigned long offset;    /**< Requested physical address (0 for SAREA)*/
         unsigned long size;      /**< Requested physical size (bytes) */
-        drm_map_type_t type;     /**< Type of memory to map */
-        drm_map_flags_t flags;   /**< Flags */
+        enum drm_map_type type;  /**< Type of memory to map */
+        enum drm_map_flags flags;        /**< Flags */
         void *handle;            /**< User-space: "Handle" to pass to mmap() */
                                  /**< Kernel-space: kernel-virtual address */
         int mtrr;                /**< MTRR slot used */
         /*   Private data */
-} drm_map_t;
+};
 
 /**
  * DRM_IOCTL_GET_CLIENT ioctl argument type.
  */
-typedef struct drm_client {
+struct drm_client {
         int idx;                /**< Which client desired? */
         int auth;               /**< Is client authenticated? */
         unsigned long pid;      /**< Process ID */
         unsigned long uid;      /**< User ID */
         unsigned long magic;    /**< Magic */
         unsigned long iocs;     /**< Ioctl count */
-} drm_client_t;
+};
 
-typedef enum {
+enum drm_stat_type {
         _DRM_STAT_LOCK,
         _DRM_STAT_OPENS,
         _DRM_STAT_CLOSES,
@@ -275,23 +275,23 @@ typedef enum {
         _DRM_STAT_SPECIAL,      /**< Special DMA (e.g., priority or polled) */
         _DRM_STAT_MISSED        /**< Missed DMA opportunity */
             /* Add to the *END* of the list */
-} drm_stat_type_t;
+};
 
 /**
  * DRM_IOCTL_GET_STATS ioctl argument type.
  */
-typedef struct drm_stats {
+struct drm_stats {
         unsigned long count;
         struct {
                 unsigned long value;
-                drm_stat_type_t type;
+                enum drm_stat_type type;
         } data[15];
-} drm_stats_t;
+};
 
 /**
  * Hardware locking flags.
  */
-typedef enum drm_lock_flags {
+enum drm_lock_flags {
         _DRM_LOCK_READY = 0x01,      /**< Wait until hardware is ready for DMA */
         _DRM_LOCK_QUIESCENT = 0x02,  /**< Wait until hardware quiescent */
         _DRM_LOCK_FLUSH = 0x04,      /**< Flush this context's DMA queue first */
@@ -301,17 +301,17 @@ typedef enum drm_lock_flags {
            full-screen DGA-like mode. */
         _DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */
         _DRM_HALT_CUR_QUEUES = 0x20  /**< Halt all current queues */
-} drm_lock_flags_t;
+};
 
 /**
  * DRM_IOCTL_LOCK, DRM_IOCTL_UNLOCK and DRM_IOCTL_FINISH ioctl argument type.
  *
  * \sa drmGetLock() and drmUnlock().
  */
-typedef struct drm_lock {
+struct drm_lock {
         int context;
-        drm_lock_flags_t flags;
-} drm_lock_t;
+        enum drm_lock_flags flags;
+};
 
 /**
  * DMA flags
@@ -321,7 +321,7 @@ typedef struct drm_lock {
  *
  * \sa drm_dma.
  */
-typedef enum drm_dma_flags {
+enum drm_dma_flags {
         /* Flags for DMA buffer dispatch */
         _DRM_DMA_BLOCK = 0x01,        /**<
                                        * Block until buffer dispatched.
@@ -340,14 +340,14 @@ typedef enum drm_dma_flags {
         _DRM_DMA_WAIT = 0x10,         /**< Wait for free buffers */
         _DRM_DMA_SMALLER_OK = 0x20,   /**< Smaller-than-requested buffers OK */
         _DRM_DMA_LARGER_OK = 0x40     /**< Larger-than-requested buffers OK */
-} drm_dma_flags_t;
+};
 
 /**
  * DRM_IOCTL_ADD_BUFS and DRM_IOCTL_MARK_BUFS ioctl argument type.
  *
  * \sa drmAddBufs().
  */
-typedef struct drm_buf_desc {
+struct drm_buf_desc {
         int count;               /**< Number of buffers of this size */
         int size;                /**< Size in bytes */
         int low_mark;            /**< Low water mark */
@@ -363,44 +363,44 @@ typedef struct drm_buf_desc {
                                   * Start address of where the AGP buffers are
                                   * in the AGP aperture
                                   */
-} drm_buf_desc_t;
+};
 
 /**
  * DRM_IOCTL_INFO_BUFS ioctl argument type.
  */
-typedef struct drm_buf_info {
+struct drm_buf_info {
         int count;              /**< Entries in list */
-        drm_buf_desc_t __user *list;
-} drm_buf_info_t;
+        struct drm_buf_desc __user *list;
+};
 
 /**
  * DRM_IOCTL_FREE_BUFS ioctl argument type.
  */
-typedef struct drm_buf_free {
+struct drm_buf_free {
         int count;
         int __user *list;
-} drm_buf_free_t;
+};
 
 /**
  * Buffer information
  *
  * \sa drm_buf_map.
  */
-typedef struct drm_buf_pub {
+struct drm_buf_pub {
         int idx;                       /**< Index into the master buffer list */
         int total;                     /**< Buffer size */
         int used;                      /**< Amount of buffer in use (for DMA) */
         void __user *address;          /**< Address of buffer */
-} drm_buf_pub_t;
+};
 
 /**
  * DRM_IOCTL_MAP_BUFS ioctl argument type.
  */
-typedef struct drm_buf_map {
+struct drm_buf_map {
         int count;              /**< Length of the buffer list */
         void __user *virtual;           /**< Mmap'd area in user-virtual */
-        drm_buf_pub_t __user *list;     /**< Buffer information */
-} drm_buf_map_t;
+        struct drm_buf_pub __user *list;        /**< Buffer information */
+};
 
 /**
  * DRM_IOCTL_DMA ioctl argument type.
@@ -409,48 +409,48 @@ typedef struct drm_buf_map {
  *
  * \sa drmDMA().
  */
-typedef struct drm_dma {
+struct drm_dma {
         int context;                      /**< Context handle */
         int send_count;                   /**< Number of buffers to send */
         int __user *send_indices;         /**< List of handles to buffers */
         int __user *send_sizes;           /**< Lengths of data to send */
-        drm_dma_flags_t flags;            /**< Flags */
+        enum drm_dma_flags flags;         /**< Flags */
         int request_count;                /**< Number of buffers requested */
         int request_size;                 /**< Desired size for buffers */
         int __user *request_indices;      /**< Buffer information */
         int __user *request_sizes;
         int granted_count;                /**< Number of buffers granted */
-} drm_dma_t;
+};
 
-typedef enum {
+enum drm_ctx_flags {
         _DRM_CONTEXT_PRESERVED = 0x01,
         _DRM_CONTEXT_2DONLY = 0x02
-} drm_ctx_flags_t;
+};
 
 /**
  * DRM_IOCTL_ADD_CTX ioctl argument type.
  *
  * \sa drmCreateContext() and drmDestroyContext().
  */
-typedef struct drm_ctx {
+struct drm_ctx {
         drm_context_t handle;
-        drm_ctx_flags_t flags;
-} drm_ctx_t;
+        enum drm_ctx_flags flags;
+};
 
 /**
  * DRM_IOCTL_RES_CTX ioctl argument type.
  */
-typedef struct drm_ctx_res {
+struct drm_ctx_res {
         int count;
-        drm_ctx_t __user *contexts;
-} drm_ctx_res_t;
+        struct drm_ctx __user *contexts;
+};
 
 /**
  * DRM_IOCTL_ADD_DRAW and DRM_IOCTL_RM_DRAW ioctl argument type.
  */
-typedef struct drm_draw {
+struct drm_draw {
         drm_drawable_t handle;
-} drm_draw_t;
+};
 
 /**
  * DRM_IOCTL_UPDATE_DRAW ioctl argument type.
@@ -459,52 +459,52 @@ typedef enum {
         DRM_DRAWABLE_CLIPRECTS,
 } drm_drawable_info_type_t;
 
-typedef struct drm_update_draw {
+struct drm_update_draw {
         drm_drawable_t handle;
         unsigned int type;
         unsigned int num;
         unsigned long long data;
-} drm_update_draw_t;
+};
 
 /**
  * DRM_IOCTL_GET_MAGIC and DRM_IOCTL_AUTH_MAGIC ioctl argument type.
  */
-typedef struct drm_auth {
+struct drm_auth {
         drm_magic_t magic;
-} drm_auth_t;
+};
 
 /**
  * DRM_IOCTL_IRQ_BUSID ioctl argument type.
  *
  * \sa drmGetInterruptFromBusID().
  */
-typedef struct drm_irq_busid {
+struct drm_irq_busid {
         int irq;        /**< IRQ number */
         int busnum;     /**< bus number */
         int devnum;     /**< device number */
         int funcnum;    /**< function number */
-} drm_irq_busid_t;
+};
 
-typedef enum {
+enum drm_vblank_seq_type {
         _DRM_VBLANK_ABSOLUTE = 0x0,     /**< Wait for specific vblank sequence number */
         _DRM_VBLANK_RELATIVE = 0x1,     /**< Wait for given number of vblanks */
         _DRM_VBLANK_NEXTONMISS = 0x10000000,    /**< If missed, wait for next vblank */
         _DRM_VBLANK_SECONDARY = 0x20000000,     /**< Secondary display controller */
         _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking */
-} drm_vblank_seq_type_t;
+};
 
 #define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE)
 #define _DRM_VBLANK_FLAGS_MASK (_DRM_VBLANK_SIGNAL | _DRM_VBLANK_SECONDARY | \
                                 _DRM_VBLANK_NEXTONMISS)
 
 struct drm_wait_vblank_request {
-        drm_vblank_seq_type_t type;
+        enum drm_vblank_seq_type type;
         unsigned int sequence;
         unsigned long signal;
 };
 
 struct drm_wait_vblank_reply {
-        drm_vblank_seq_type_t type;
+        enum drm_vblank_seq_type type;
         unsigned int sequence;
         long tval_sec;
         long tval_usec;
@@ -515,41 +515,41 @@ struct drm_wait_vblank_reply {
  *
  * \sa drmWaitVBlank().
  */
-typedef union drm_wait_vblank {
+union drm_wait_vblank {
         struct drm_wait_vblank_request request;
         struct drm_wait_vblank_reply reply;
-} drm_wait_vblank_t;
+};
 
 /**
  * DRM_IOCTL_AGP_ENABLE ioctl argument type.
  *
  * \sa drmAgpEnable().
  */
-typedef struct drm_agp_mode {
+struct drm_agp_mode {
         unsigned long mode;     /**< AGP mode */
-} drm_agp_mode_t;
+};
 
 /**
  * DRM_IOCTL_AGP_ALLOC and DRM_IOCTL_AGP_FREE ioctls argument type.
  *
  * \sa drmAgpAlloc() and drmAgpFree().
  */
-typedef struct drm_agp_buffer {
+struct drm_agp_buffer {
         unsigned long size;     /**< In bytes -- will round to page boundary */
         unsigned long handle;   /**< Used for binding / unbinding */
         unsigned long type;     /**< Type of memory to allocate */
         unsigned long physical; /**< Physical used by i810 */
-} drm_agp_buffer_t;
+};
 
 /**
  * DRM_IOCTL_AGP_BIND and DRM_IOCTL_AGP_UNBIND ioctls argument type.
  *
  * \sa drmAgpBind() and drmAgpUnbind().
  */
-typedef struct drm_agp_binding {
+struct drm_agp_binding {
         unsigned long handle;   /**< From drm_agp_buffer */
         unsigned long offset;   /**< In bytes -- will round to page boundary */
-} drm_agp_binding_t;
+};
 
 /**
  * DRM_IOCTL_AGP_INFO ioctl argument type.
@@ -558,7 +558,7 @@ typedef struct drm_agp_binding {
  * drmAgpBase(), drmAgpSize(), drmAgpMemoryUsed(), drmAgpMemoryAvail(),
  * drmAgpVendorId() and drmAgpDeviceId().
  */
-typedef struct drm_agp_info {
+struct drm_agp_info {
         int agp_version_major;
         int agp_version_minor;
         unsigned long mode;
@@ -570,25 +570,25 @@ typedef struct drm_agp_info {
         /* PCI information */
         unsigned short id_vendor;
         unsigned short id_device;
-} drm_agp_info_t;
+};
 
 /**
  * DRM_IOCTL_SG_ALLOC ioctl argument type.
  */
-typedef struct drm_scatter_gather {
+struct drm_scatter_gather {
         unsigned long size;     /**< In bytes -- will round to page boundary */
         unsigned long handle;   /**< Used for mapping / unmapping */
-} drm_scatter_gather_t;
+};
 
 /**
  * DRM_IOCTL_SET_VERSION ioctl argument type.
  */
-typedef struct drm_set_version {
+struct drm_set_version {
         int drm_di_major;
         int drm_di_minor;
         int drm_dd_major;
         int drm_dd_minor;
-} drm_set_version_t;
+};
 
 #define DRM_IOCTL_BASE                  'd'
 #define DRM_IO(nr)                      _IO(DRM_IOCTL_BASE,nr)
@@ -596,61 +596,61 @@ typedef struct drm_set_version {
 #define DRM_IOW(nr,type)                _IOW(DRM_IOCTL_BASE,nr,type)
 #define DRM_IOWR(nr,type)               _IOWR(DRM_IOCTL_BASE,nr,type)
 
-#define DRM_IOCTL_VERSION               DRM_IOWR(0x00, drm_version_t)
-#define DRM_IOCTL_GET_UNIQUE            DRM_IOWR(0x01, drm_unique_t)
-#define DRM_IOCTL_GET_MAGIC             DRM_IOR( 0x02, drm_auth_t)
-#define DRM_IOCTL_IRQ_BUSID             DRM_IOWR(0x03, drm_irq_busid_t)
-#define DRM_IOCTL_GET_MAP               DRM_IOWR(0x04, drm_map_t)
-#define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, drm_client_t)
-#define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, drm_stats_t)
-#define DRM_IOCTL_SET_VERSION           DRM_IOWR(0x07, drm_set_version_t)
-
-#define DRM_IOCTL_SET_UNIQUE            DRM_IOW( 0x10, drm_unique_t)
-#define DRM_IOCTL_AUTH_MAGIC            DRM_IOW( 0x11, drm_auth_t)
-#define DRM_IOCTL_BLOCK                 DRM_IOWR(0x12, drm_block_t)
-#define DRM_IOCTL_UNBLOCK               DRM_IOWR(0x13, drm_block_t)
-#define DRM_IOCTL_CONTROL               DRM_IOW( 0x14, drm_control_t)
-#define DRM_IOCTL_ADD_MAP               DRM_IOWR(0x15, drm_map_t)
-#define DRM_IOCTL_ADD_BUFS              DRM_IOWR(0x16, drm_buf_desc_t)
-#define DRM_IOCTL_MARK_BUFS             DRM_IOW( 0x17, drm_buf_desc_t)
-#define DRM_IOCTL_INFO_BUFS             DRM_IOWR(0x18, drm_buf_info_t)
-#define DRM_IOCTL_MAP_BUFS              DRM_IOWR(0x19, drm_buf_map_t)
-#define DRM_IOCTL_FREE_BUFS             DRM_IOW( 0x1a, drm_buf_free_t)
-
-#define DRM_IOCTL_RM_MAP                DRM_IOW( 0x1b, drm_map_t)
-
-#define DRM_IOCTL_SET_SAREA_CTX         DRM_IOW( 0x1c, drm_ctx_priv_map_t)
-#define DRM_IOCTL_GET_SAREA_CTX         DRM_IOWR(0x1d, drm_ctx_priv_map_t)
-
-#define DRM_IOCTL_ADD_CTX               DRM_IOWR(0x20, drm_ctx_t)
-#define DRM_IOCTL_RM_CTX                DRM_IOWR(0x21, drm_ctx_t)
-#define DRM_IOCTL_MOD_CTX               DRM_IOW( 0x22, drm_ctx_t)
-#define DRM_IOCTL_GET_CTX               DRM_IOWR(0x23, drm_ctx_t)
-#define DRM_IOCTL_SWITCH_CTX            DRM_IOW( 0x24, drm_ctx_t)
-#define DRM_IOCTL_NEW_CTX               DRM_IOW( 0x25, drm_ctx_t)
-#define DRM_IOCTL_RES_CTX               DRM_IOWR(0x26, drm_ctx_res_t)
-#define DRM_IOCTL_ADD_DRAW              DRM_IOWR(0x27, drm_draw_t)
-#define DRM_IOCTL_RM_DRAW               DRM_IOWR(0x28, drm_draw_t)
-#define DRM_IOCTL_DMA                   DRM_IOWR(0x29, drm_dma_t)
-#define DRM_IOCTL_LOCK                  DRM_IOW( 0x2a, drm_lock_t)
-#define DRM_IOCTL_UNLOCK                DRM_IOW( 0x2b, drm_lock_t)
-#define DRM_IOCTL_FINISH                DRM_IOW( 0x2c, drm_lock_t)
+#define DRM_IOCTL_VERSION               DRM_IOWR(0x00, struct drm_version)
+#define DRM_IOCTL_GET_UNIQUE            DRM_IOWR(0x01, struct drm_unique)
+#define DRM_IOCTL_GET_MAGIC             DRM_IOR( 0x02, struct drm_auth)
+#define DRM_IOCTL_IRQ_BUSID             DRM_IOWR(0x03, struct drm_irq_busid)
+#define DRM_IOCTL_GET_MAP               DRM_IOWR(0x04, struct drm_map)
+#define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
+#define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
+#define DRM_IOCTL_SET_VERSION           DRM_IOWR(0x07, struct drm_set_version)
+
+#define DRM_IOCTL_SET_UNIQUE            DRM_IOW( 0x10, struct drm_unique)
+#define DRM_IOCTL_AUTH_MAGIC            DRM_IOW( 0x11, struct drm_auth)
+#define DRM_IOCTL_BLOCK                 DRM_IOWR(0x12, struct drm_block)
+#define DRM_IOCTL_UNBLOCK               DRM_IOWR(0x13, struct drm_block)
+#define DRM_IOCTL_CONTROL               DRM_IOW( 0x14, struct drm_control)
+#define DRM_IOCTL_ADD_MAP               DRM_IOWR(0x15, struct drm_map)
+#define DRM_IOCTL_ADD_BUFS              DRM_IOWR(0x16, struct drm_buf_desc)
+#define DRM_IOCTL_MARK_BUFS             DRM_IOW( 0x17, struct drm_buf_desc)
+#define DRM_IOCTL_INFO_BUFS             DRM_IOWR(0x18, struct drm_buf_info)
+#define DRM_IOCTL_MAP_BUFS              DRM_IOWR(0x19, struct drm_buf_map)
+#define DRM_IOCTL_FREE_BUFS             DRM_IOW( 0x1a, struct drm_buf_free)
+
+#define DRM_IOCTL_RM_MAP                DRM_IOW( 0x1b, struct drm_map)
+
+#define DRM_IOCTL_SET_SAREA_CTX         DRM_IOW( 0x1c, struct drm_ctx_priv_map)
+#define DRM_IOCTL_GET_SAREA_CTX         DRM_IOWR(0x1d, struct drm_ctx_priv_map)
+
+#define DRM_IOCTL_ADD_CTX               DRM_IOWR(0x20, struct drm_ctx)
+#define DRM_IOCTL_RM_CTX                DRM_IOWR(0x21, struct drm_ctx)
+#define DRM_IOCTL_MOD_CTX               DRM_IOW( 0x22, struct drm_ctx)
+#define DRM_IOCTL_GET_CTX               DRM_IOWR(0x23, struct drm_ctx)
+#define DRM_IOCTL_SWITCH_CTX            DRM_IOW( 0x24, struct drm_ctx)
+#define DRM_IOCTL_NEW_CTX               DRM_IOW( 0x25, struct drm_ctx)
+#define DRM_IOCTL_RES_CTX               DRM_IOWR(0x26, struct drm_ctx_res)
+#define DRM_IOCTL_ADD_DRAW              DRM_IOWR(0x27, struct drm_draw)
+#define DRM_IOCTL_RM_DRAW               DRM_IOWR(0x28, struct drm_draw)
+#define DRM_IOCTL_DMA                   DRM_IOWR(0x29, struct drm_dma)
+#define DRM_IOCTL_LOCK                  DRM_IOW( 0x2a, struct drm_lock)
+#define DRM_IOCTL_UNLOCK                DRM_IOW( 0x2b, struct drm_lock)
+#define DRM_IOCTL_FINISH                DRM_IOW( 0x2c, struct drm_lock)
 
 #define DRM_IOCTL_AGP_ACQUIRE           DRM_IO(  0x30)
 #define DRM_IOCTL_AGP_RELEASE           DRM_IO(  0x31)
-#define DRM_IOCTL_AGP_ENABLE            DRM_IOW( 0x32, drm_agp_mode_t)
-#define DRM_IOCTL_AGP_INFO              DRM_IOR( 0x33, drm_agp_info_t)
-#define DRM_IOCTL_AGP_ALLOC             DRM_IOWR(0x34, drm_agp_buffer_t)
-#define DRM_IOCTL_AGP_FREE              DRM_IOW( 0x35, drm_agp_buffer_t)
-#define DRM_IOCTL_AGP_BIND              DRM_IOW( 0x36, drm_agp_binding_t)
-#define DRM_IOCTL_AGP_UNBIND            DRM_IOW( 0x37, drm_agp_binding_t)
+#define DRM_IOCTL_AGP_ENABLE            DRM_IOW( 0x32, struct drm_agp_mode)
+#define DRM_IOCTL_AGP_INFO              DRM_IOR( 0x33, struct drm_agp_info)
+#define DRM_IOCTL_AGP_ALLOC             DRM_IOWR(0x34, struct drm_agp_buffer)
+#define DRM_IOCTL_AGP_FREE              DRM_IOW( 0x35, struct drm_agp_buffer)
+#define DRM_IOCTL_AGP_BIND              DRM_IOW( 0x36, struct drm_agp_binding)
+#define DRM_IOCTL_AGP_UNBIND            DRM_IOW( 0x37, struct drm_agp_binding)
 
-#define DRM_IOCTL_SG_ALLOC              DRM_IOW( 0x38, drm_scatter_gather_t)
-#define DRM_IOCTL_SG_FREE               DRM_IOW( 0x39, drm_scatter_gather_t)
+#define DRM_IOCTL_SG_ALLOC              DRM_IOW( 0x38, struct drm_scatter_gather)
+#define DRM_IOCTL_SG_FREE               DRM_IOW( 0x39, struct drm_scatter_gather)
 
-#define DRM_IOCTL_WAIT_VBLANK           DRM_IOWR(0x3a, drm_wait_vblank_t)
+#define DRM_IOCTL_WAIT_VBLANK           DRM_IOWR(0x3a, union drm_wait_vblank)
 
-#define DRM_IOCTL_UPDATE_DRAW           DRM_IOW(0x3f, drm_update_draw_t)
+#define DRM_IOCTL_UPDATE_DRAW           DRM_IOW(0x3f, struct drm_update_draw)
 
 /**
  * Device specific ioctls should only be in their respective headers
@@ -663,4 +663,49 @@ typedef struct drm_set_version {
 #define DRM_COMMAND_BASE                0x40
 #define DRM_COMMAND_END                 0xA0
 
+/* typedef area */
+#ifndef __KERNEL__
+typedef struct drm_clip_rect drm_clip_rect_t;
+typedef struct drm_drawable_info drm_drawable_info_t;
+typedef struct drm_tex_region drm_tex_region_t;
+typedef struct drm_hw_lock drm_hw_lock_t;
+typedef struct drm_version drm_version_t;
+typedef struct drm_unique drm_unique_t;
+typedef struct drm_list drm_list_t;
+typedef struct drm_block drm_block_t;
+typedef struct drm_control drm_control_t;
+typedef enum drm_map_type drm_map_type_t;
+typedef enum drm_map_flags drm_map_flags_t;
+typedef struct drm_ctx_priv_map drm_ctx_priv_map_t;
+typedef struct drm_map drm_map_t;
+typedef struct drm_client drm_client_t;
+typedef enum drm_stat_type drm_stat_type_t;
+typedef struct drm_stats drm_stats_t;
+typedef enum drm_lock_flags drm_lock_flags_t;
+typedef struct drm_lock drm_lock_t;
+typedef enum drm_dma_flags drm_dma_flags_t;
+typedef struct drm_buf_desc drm_buf_desc_t;
+typedef struct drm_buf_info drm_buf_info_t;
+typedef struct drm_buf_free drm_buf_free_t;
+typedef struct drm_buf_pub drm_buf_pub_t;
+typedef struct drm_buf_map drm_buf_map_t;
+typedef struct drm_dma drm_dma_t;
+typedef union drm_wait_vblank drm_wait_vblank_t;
+typedef struct drm_agp_mode drm_agp_mode_t;
+typedef enum drm_ctx_flags drm_ctx_flags_t;
+typedef struct drm_ctx drm_ctx_t;
+typedef struct drm_ctx_res drm_ctx_res_t;
+typedef struct drm_draw drm_draw_t;
+typedef struct drm_update_draw drm_update_draw_t;
+typedef struct drm_auth drm_auth_t;
+typedef struct drm_irq_busid drm_irq_busid_t;
+typedef enum drm_vblank_seq_type drm_vblank_seq_type_t;
+
+typedef struct drm_agp_buffer drm_agp_buffer_t;
+typedef struct drm_agp_binding drm_agp_binding_t;
+typedef struct drm_agp_info drm_agp_info_t;
+typedef struct drm_scatter_gather drm_scatter_gather_t;
+typedef struct drm_set_version drm_set_version_t;
+#endif
+
 #endif
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 8634f7613620..a785f3e79b1c 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -395,7 +395,7 @@ typedef struct drm_queue {
         atomic_t total_flushed;         /**< Total flushes statistic */
         atomic_t total_locks;           /**< Total locks statistics */
 #endif
-        drm_ctx_flags_t flags;          /**< Context preserving and 2D-only */
+        enum drm_ctx_flags flags;       /**< Context preserving and 2D-only */
         drm_waitlist_t waitlist;        /**< Pending buffers */
         wait_queue_head_t flush_queue;  /**< Processes waiting until flush */
 } drm_queue_t;
@@ -404,7 +404,7 @@ typedef struct drm_queue {
  * Lock data.
  */
 typedef struct drm_lock_data {
-        drm_hw_lock_t *hw_lock;         /**< Hardware lock */
+        struct drm_hw_lock *hw_lock;    /**< Hardware lock */
         struct file *filp;              /**< File descr of lock holder (0=kernel) */
         wait_queue_head_t lock_queue;   /**< Queue of blocked processes */
         unsigned long lock_time;        /**< Time of last lock in jiffies */
@@ -477,7 +477,7 @@ typedef struct drm_sg_mem {
 
 typedef struct drm_sigdata {
         int context;
-        drm_hw_lock_t *lock;
+        struct drm_hw_lock *lock;
 } drm_sigdata_t;
 
 /**
@@ -486,11 +486,11 @@ typedef struct drm_sigdata {
 typedef struct drm_map_list {
         struct list_head head;          /**< list head */
         drm_hash_item_t hash;
-        drm_map_t *map;                 /**< mapping */
+        struct drm_map *map;                    /**< mapping */
         unsigned int user_token;
 } drm_map_list_t;
 
-typedef drm_map_t drm_local_map_t;
+typedef struct drm_map drm_local_map_t;
 
 /**
  * Context handle list
@@ -594,9 +594,10 @@ struct drm_driver {
                                         struct file *filp);
         void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
                                         struct file * filp);
-        unsigned long (*get_map_ofs) (drm_map_t * map);
+        unsigned long (*get_map_ofs) (struct drm_map * map);
         unsigned long (*get_reg_ofs) (struct drm_device * dev);
-        void (*set_version) (struct drm_device * dev, drm_set_version_t * sv);
+        void (*set_version) (struct drm_device * dev,
+                             struct drm_set_version *sv);
 
         int major;
         int minor;
@@ -656,7 +657,7 @@ typedef struct drm_device {
         /** \name Performance counters */
         /*@{ */
         unsigned long counters;
-        drm_stat_type_t types[15];
+        enum drm_stat_type types[15];
         atomic_t counts[15];
         /*@} */
 
@@ -679,7 +680,7 @@ typedef struct drm_device {
         int ctx_count;                  /**< Number of context handles */
         struct mutex ctxlist_mutex;     /**< For ctxlist */
 
-        drm_map_t **context_sareas;         /**< per-context SAREA's */
+        struct drm_map **context_sareas;            /**< per-context SAREA's */
         int max_context;
 
         struct list_head vmalist;       /**< List of vmas (for debugging) */
@@ -756,7 +757,7 @@ typedef struct drm_device {
         unsigned int drw_bitfield_length;
         u32 *drw_bitfield;
         unsigned int drw_info_length;
-        drm_drawable_info_t **drw_info;
+        struct drm_drawable_info **drw_info;
         /*@} */
 } drm_device_t;
 
@@ -904,7 +905,7 @@ extern int drm_rmdraw(struct inode *inode, struct file *filp,
                       unsigned int cmd, unsigned long arg);
 extern int drm_update_drawable_info(struct inode *inode, struct file *filp,
                        unsigned int cmd, unsigned long arg);
-extern drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev,
+extern struct drm_drawable_info *drm_get_drawable_info(drm_device_t *dev,
                                                   drm_drawable_t id);
 
                                 /* Authentication IOCTL support (drm_auth.h) */
@@ -932,11 +933,11 @@ extern int drm_i_have_hw_lock(struct file *filp);
 extern int drm_kernel_take_hw_lock(struct file *filp);
 
                                 /* Buffer management support (drm_bufs.h) */
-extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request);
-extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request);
+extern int drm_addbufs_agp(drm_device_t * dev, struct drm_buf_desc * request);
+extern int drm_addbufs_pci(drm_device_t * dev, struct drm_buf_desc * request);
 extern int drm_addmap(drm_device_t * dev, unsigned int offset,
-                      unsigned int size, drm_map_type_t type,
-                      drm_map_flags_t flags, drm_local_map_t ** map_ptr);
+                      unsigned int size, enum drm_map_type type,
+                      enum drm_map_flags flags, drm_local_map_t ** map_ptr);
 extern int drm_addmap_ioctl(struct inode *inode, struct file *filp,
                             unsigned int cmd, unsigned long arg);
 extern int drm_rmmap(drm_device_t * dev, drm_local_map_t * map);
@@ -989,22 +990,22 @@ extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
 extern int drm_agp_release(drm_device_t * dev);
 extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
                                  unsigned int cmd, unsigned long arg);
-extern int drm_agp_enable(drm_device_t * dev, drm_agp_mode_t mode);
+extern int drm_agp_enable(drm_device_t * dev, struct drm_agp_mode mode);
 extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
                                 unsigned int cmd, unsigned long arg);
-extern int drm_agp_info(drm_device_t * dev, drm_agp_info_t * info);
+extern int drm_agp_info(drm_device_t * dev, struct drm_agp_info * info);
 extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
                               unsigned int cmd, unsigned long arg);
-extern int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request);
+extern int drm_agp_alloc(drm_device_t *dev, struct drm_agp_buffer *request);
 extern int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
                          unsigned int cmd, unsigned long arg);
-extern int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request);
+extern int drm_agp_free(drm_device_t *dev, struct drm_agp_buffer *request);
 extern int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
                         unsigned int cmd, unsigned long arg);
-extern int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request);
+extern int drm_agp_unbind(drm_device_t *dev, struct drm_agp_binding *request);
 extern int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
                           unsigned int cmd, unsigned long arg);
-extern int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request);
+extern int drm_agp_bind(drm_device_t *dev, struct drm_agp_binding *request);
 extern int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
                         unsigned int cmd, unsigned long arg);
 extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge,
@@ -1137,7 +1138,7 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area);
 
 /*@}*/
 
-extern unsigned long drm_core_get_map_ofs(drm_map_t * map);
+extern unsigned long drm_core_get_map_ofs(struct drm_map * map);
 extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
 
 #endif                          /* __KERNEL__ */
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c
index 54c59e7ec7b6..d1a9e508af4b 100644
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/char/drm/drm_agpsupport.c
@@ -48,7 +48,7 @@
  * Verifies the AGP device has been initialized and acquired and fills in the
  * drm_agp_info structure with the information in drm_agp_head::agp_info.
  */
-int drm_agp_info(drm_device_t * dev, drm_agp_info_t * info)
+int drm_agp_info(drm_device_t * dev, struct drm_agp_info * info)
 {
         DRM_AGP_KERN *kern;
 
@@ -76,14 +76,14 @@ int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_agp_info_t info;
+        struct drm_agp_info info;
         int err;
 
         err = drm_agp_info(dev, &info);
         if (err)
                 return err;
 
-        if (copy_to_user((drm_agp_info_t __user *) arg, &info, sizeof(info)))
+        if (copy_to_user((struct drm_agp_info __user *) arg, &info, sizeof(info)))
                 return -EFAULT;
         return 0;
 }
@@ -168,7 +168,7 @@ int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
  * Verifies the AGP device has been acquired but not enabled, and calls
  * \c agp_enable.
  */
-int drm_agp_enable(drm_device_t * dev, drm_agp_mode_t mode)
+int drm_agp_enable(drm_device_t * dev, struct drm_agp_mode mode)
 {
         if (!dev->agp || !dev->agp->acquired)
                 return -EINVAL;
@@ -187,9 +187,9 @@ int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_agp_mode_t mode;
+        struct drm_agp_mode mode;
 
-        if (copy_from_user(&mode, (drm_agp_mode_t __user *) arg, sizeof(mode)))
+        if (copy_from_user(&mode, (struct drm_agp_mode __user *) arg, sizeof(mode)))
                 return -EFAULT;
 
         return drm_agp_enable(dev, mode);
@@ -207,7 +207,7 @@ int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
  * Verifies the AGP device is present and has been acquired, allocates the
  * memory via alloc_agp() and creates a drm_agp_mem entry for it.
  */
-int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request)
+int drm_agp_alloc(drm_device_t *dev, struct drm_agp_buffer *request)
 {
         drm_agp_mem_t *entry;
         DRM_AGP_MEM *memory;
@@ -246,8 +246,8 @@ int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_agp_buffer_t request;
-        drm_agp_buffer_t __user *argp = (void __user *)arg;
+        struct drm_agp_buffer request;
+        struct drm_agp_buffer __user *argp = (void __user *)arg;
         int err;
 
         if (copy_from_user(&request, argp, sizeof(request)))
@@ -305,7 +305,7 @@ static drm_agp_mem_t *drm_agp_lookup_entry(drm_device_t * dev,
  * Verifies the AGP device is present and acquired, looks-up the AGP memory
  * entry and passes it to the unbind_agp() function.
  */
-int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request)
+int drm_agp_unbind(drm_device_t *dev, struct drm_agp_binding *request)
 {
         drm_agp_mem_t *entry;
         int ret;
@@ -328,10 +328,10 @@ int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_agp_binding_t request;
+        struct drm_agp_binding request;
 
         if (copy_from_user
-            (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))
+            (&request, (struct drm_agp_binding __user *) arg, sizeof(request)))
                 return -EFAULT;
 
         return drm_agp_unbind(dev, &request);
@@ -350,7 +350,7 @@ int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
  * is currently bound into the GATT. Looks-up the AGP memory entry and passes
  * it to bind_agp() function.
  */
-int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request)
+int drm_agp_bind(drm_device_t *dev, struct drm_agp_binding *request)
 {
         drm_agp_mem_t *entry;
         int retcode;
@@ -377,10 +377,10 @@ int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_agp_binding_t request;
+        struct drm_agp_binding request;
 
         if (copy_from_user
-            (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))
+            (&request, (struct drm_agp_binding __user *) arg, sizeof(request)))
                 return -EFAULT;
 
         return drm_agp_bind(dev, &request);
@@ -400,7 +400,7 @@ int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
  * unbind_agp(). Frees it via free_agp() as well as the entry itself
  * and unlinks from the doubly linked list it's inserted in.
  */
-int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request)
+int drm_agp_free(drm_device_t *dev, struct drm_agp_buffer *request)
 {
         drm_agp_mem_t *entry;
 
@@ -424,10 +424,10 @@ int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_agp_buffer_t request;
+        struct drm_agp_buffer request;
 
         if (copy_from_user
-            (&request, (drm_agp_buffer_t __user *) arg, sizeof(request)))
+            (&request, (struct drm_agp_buffer __user *) arg, sizeof(request)))
                 return -EFAULT;
 
         return drm_agp_free(dev, &request);
diff --git a/drivers/char/drm/drm_auth.c b/drivers/char/drm/drm_auth.c
index c7b19d35bcd6..16e6f0e93b20 100644
--- a/drivers/char/drm/drm_auth.c
+++ b/drivers/char/drm/drm_auth.c
@@ -144,7 +144,7 @@ int drm_getmagic(struct inode *inode, struct file *filp,
         static DEFINE_SPINLOCK(lock);
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_auth_t auth;
+        struct drm_auth auth;
 
         /* Find unique magic */
         if (priv->magic) {
@@ -162,7 +162,7 @@ int drm_getmagic(struct inode *inode, struct file *filp,
         }
 
         DRM_DEBUG("%u\n", auth.magic);
-        if (copy_to_user((drm_auth_t __user *) arg, &auth, sizeof(auth)))
+        if (copy_to_user((struct drm_auth __user *) arg, &auth, sizeof(auth)))
                 return -EFAULT;
         return 0;
 }
@@ -183,10 +183,10 @@ int drm_authmagic(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_auth_t auth;
+        struct drm_auth auth;
         drm_file_t *file;
 
-        if (copy_from_user(&auth, (drm_auth_t __user *) arg, sizeof(auth)))
+        if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth)))
                 return -EFAULT;
         DRM_DEBUG("%u\n", auth.magic);
         if ((file = drm_find_file(dev, auth.magic))) {
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index dac057879594..6678db2abd8e 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -102,10 +102,10 @@ static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
  * applicable and if supported by the kernel.
  */
 static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
-                           unsigned int size, drm_map_type_t type,
-                           drm_map_flags_t flags, drm_map_list_t ** maplist)
+                           unsigned int size, enum drm_map_type type,
+                           enum drm_map_flags flags, drm_map_list_t ** maplist)
 {
-        drm_map_t *map;
+        struct drm_map *map;
         drm_map_list_t *list;
         drm_dma_handle_t *dmah;
         unsigned long user_token;
@@ -311,8 +311,8 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
         }
 
 int drm_addmap(drm_device_t * dev, unsigned int offset,
-               unsigned int size, drm_map_type_t type,
-               drm_map_flags_t flags, drm_local_map_t ** map_ptr)
+               unsigned int size, enum drm_map_type type,
+               enum drm_map_flags flags, drm_local_map_t ** map_ptr)
 {
         drm_map_list_t *list;
         int rc;
@@ -330,9 +330,9 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_map_t map;
+        struct drm_map map;
         drm_map_list_t *maplist;
-        drm_map_t __user *argp = (void __user *)arg;
+        struct drm_map __user *argp = (void __user *)arg;
         int err;
 
         if (!(filp->f_mode & 3))
@@ -351,7 +351,7 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
         if (err)
                 return err;
 
-        if (copy_to_user(argp, maplist->map, sizeof(drm_map_t)))
+        if (copy_to_user(argp, maplist->map, sizeof(struct drm_map)))
                 return -EFAULT;
 
         /* avoid a warning on 64-bit, this casting isn't very nice, but the API is set so too late */
@@ -367,7 +367,7 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
  * \param inode device inode.
  * \param filp file pointer.
  * \param cmd command.
- * \param arg pointer to a drm_map_t structure.
+ * \param arg pointer to a struct drm_map structure.
  * \return zero on success or a negative value on error.
  *
  * Searches the map on drm_device::maplist, removes it from the list, see if
@@ -451,12 +451,12 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_map_t request;
+        struct drm_map request;
         drm_local_map_t *map = NULL;
         drm_map_list_t *r_list;
         int ret;
 
-        if (copy_from_user(&request, (drm_map_t __user *) arg, sizeof(request))) {
+        if (copy_from_user(&request, (struct drm_map __user *) arg, sizeof(request))) {
                 return -EFAULT;
         }
 
@@ -542,14 +542,14 @@ static void drm_cleanup_buf_error(drm_device_t * dev, drm_buf_entry_t * entry)
  * Add AGP buffers for DMA transfers.
  *
  * \param dev drm_device_t to which the buffers are to be added.
- * \param request pointer to a drm_buf_desc_t describing the request.
+ * \param request pointer to a struct drm_buf_desc describing the request.
  * \return zero on success or a negative number on failure.
  *
  * After some sanity checks creates a drm_buf structure for each buffer and
  * reallocates the buffer list of the same size order to accommodate the new
  * buffers.
  */
-int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
+int drm_addbufs_agp(drm_device_t * dev, struct drm_buf_desc * request)
 {
         drm_device_dma_t *dma = dev->dma;
         drm_buf_entry_t *entry;
@@ -719,7 +719,7 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
 EXPORT_SYMBOL(drm_addbufs_agp);
 #endif                          /* __OS_HAS_AGP */
 
-int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
+int drm_addbufs_pci(drm_device_t * dev, struct drm_buf_desc * request)
 {
         drm_device_dma_t *dma = dev->dma;
         int count;
@@ -945,7 +945,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
 }
 EXPORT_SYMBOL(drm_addbufs_pci);
 
-static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request)
+static int drm_addbufs_sg(drm_device_t * dev, struct drm_buf_desc * request)
 {
         drm_device_dma_t *dma = dev->dma;
         drm_buf_entry_t *entry;
@@ -1107,7 +1107,7 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request)
         return 0;
 }
 
-static int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
+static int drm_addbufs_fb(drm_device_t * dev, struct drm_buf_desc * request)
 {
         drm_device_dma_t *dma = dev->dma;
         drm_buf_entry_t *entry;
@@ -1274,7 +1274,7 @@ static int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
  * \param inode device inode.
  * \param filp file pointer.
  * \param cmd command.
- * \param arg pointer to a drm_buf_desc_t request.
+ * \param arg pointer to a struct drm_buf_desc request.
  * \return zero on success or a negative number on failure.
  *
  * According with the memory type specified in drm_buf_desc::flags and the
@@ -1285,7 +1285,7 @@ static int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
 int drm_addbufs(struct inode *inode, struct file *filp,
                 unsigned int cmd, unsigned long arg)
 {
-        drm_buf_desc_t request;
+        struct drm_buf_desc request;
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         int ret;
@@ -1293,7 +1293,7 @@ int drm_addbufs(struct inode *inode, struct file *filp,
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 return -EINVAL;
 
-        if (copy_from_user(&request, (drm_buf_desc_t __user *) arg,
+        if (copy_from_user(&request, (struct drm_buf_desc __user *) arg,
                            sizeof(request)))
                 return -EFAULT;
 
@@ -1340,8 +1340,8 @@ int drm_infobufs(struct inode *inode, struct file *filp,
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
-        drm_buf_info_t request;
-        drm_buf_info_t __user *argp = (void __user *)arg;
+        struct drm_buf_info request;
+        struct drm_buf_info __user *argp = (void __user *)arg;
         int i;
         int count;
 
@@ -1372,7 +1372,7 @@ int drm_infobufs(struct inode *inode, struct file *filp,
         if (request.count >= count) {
                 for (i = 0, count = 0; i < DRM_MAX_ORDER + 1; i++) {
                         if (dma->bufs[i].buf_count) {
-                                drm_buf_desc_t __user *to =
+                                struct drm_buf_desc __user *to =
                                     &request.list[count];
                                 drm_buf_entry_t *from = &dma->bufs[i];
                                 drm_freelist_t *list = &dma->bufs[i].freelist;
@@ -1428,7 +1428,7 @@ int drm_markbufs(struct inode *inode, struct file *filp,
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
-        drm_buf_desc_t request;
+        struct drm_buf_desc request;
         int order;
         drm_buf_entry_t *entry;
 
@@ -1439,7 +1439,7 @@ int drm_markbufs(struct inode *inode, struct file *filp,
                 return -EINVAL;
 
         if (copy_from_user(&request,
-                           (drm_buf_desc_t __user *) arg, sizeof(request)))
+                           (struct drm_buf_desc __user *) arg, sizeof(request)))
                 return -EFAULT;
 
         DRM_DEBUG("%d, %d, %d\n",
@@ -1478,7 +1478,7 @@ int drm_freebufs(struct inode *inode, struct file *filp,
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
-        drm_buf_free_t request;
+        struct drm_buf_free request;
         int i;
         int idx;
         drm_buf_t *buf;
@@ -1490,7 +1490,7 @@ int drm_freebufs(struct inode *inode, struct file *filp,
                 return -EINVAL;
 
         if (copy_from_user(&request,
-                           (drm_buf_free_t __user *) arg, sizeof(request)))
+                           (struct drm_buf_free __user *) arg, sizeof(request)))
                 return -EFAULT;
 
         DRM_DEBUG("%d\n", request.count);
@@ -1534,12 +1534,12 @@ int drm_mapbufs(struct inode *inode, struct file *filp,
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
-        drm_buf_map_t __user *argp = (void __user *)arg;
+        struct drm_buf_map __user *argp = (void __user *)arg;
         int retcode = 0;
         const int zero = 0;
         unsigned long virtual;
         unsigned long address;
-        drm_buf_map_t request;
+        struct drm_buf_map request;
         int i;
 
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
@@ -1565,7 +1565,7 @@ int drm_mapbufs(struct inode *inode, struct file *filp,
                         && (dma->flags & _DRM_DMA_USE_SG))
                     || (drm_core_check_feature(dev, DRIVER_FB_DMA)
                         && (dma->flags & _DRM_DMA_USE_FB))) {
-                        drm_map_t *map = dev->agp_buffer_map;
+                        struct drm_map *map = dev->agp_buffer_map;
                         unsigned long token = dev->agp_buffer_token;
 
                         if (!map) {
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index e1f882dc55aa..283f8f2895cb 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -100,7 +100,7 @@ static int drm_ctxbitmap_next(drm_device_t * dev)
                 if ((bit + 1) > dev->max_context) {
                         dev->max_context = (bit + 1);
                         if (dev->context_sareas) {
-                                drm_map_t **ctx_sareas;
+                                struct drm_map **ctx_sareas;
 
                                 ctx_sareas = drm_realloc(dev->context_sareas,
                                                          (dev->max_context -
@@ -214,9 +214,9 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_ctx_priv_map_t __user *argp = (void __user *)arg;
-        drm_ctx_priv_map_t request;
-        drm_map_t *map;
+        struct drm_ctx_priv_map __user *argp = (void __user *)arg;
+        struct drm_ctx_priv_map request;
+        struct drm_map *map;
         drm_map_list_t *_entry;
 
         if (copy_from_user(&request, argp, sizeof(request)))
@@ -265,12 +265,13 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_ctx_priv_map_t request;
-        drm_map_t *map = NULL;
+        struct drm_ctx_priv_map request;
+        struct drm_map *map = NULL;
         drm_map_list_t *r_list = NULL;
 
         if (copy_from_user(&request,
-                           (drm_ctx_priv_map_t __user *) arg, sizeof(request)))
+                           (struct drm_ctx_priv_map __user *) arg,
+                           sizeof(request)))
                 return -EFAULT;
 
         mutex_lock(&dev->struct_mutex);
@@ -370,9 +371,9 @@ static int drm_context_switch_complete(drm_device_t * dev, int new)
 int drm_resctx(struct inode *inode, struct file *filp,
                unsigned int cmd, unsigned long arg)
 {
-        drm_ctx_res_t res;
-        drm_ctx_t __user *argp = (void __user *)arg;
-        drm_ctx_t ctx;
+        struct drm_ctx_res res;
+        struct drm_ctx_res __user *argp = (void __user *)arg;
+        struct drm_ctx ctx;
         int i;
 
         if (copy_from_user(&res, argp, sizeof(res)))
@@ -410,8 +411,8 @@ int drm_addctx(struct inode *inode, struct file *filp,
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_ctx_list_t *ctx_entry;
-        drm_ctx_t __user *argp = (void __user *)arg;
-        drm_ctx_t ctx;
+        struct drm_ctx __user *argp = (void __user *)arg;
+        struct drm_ctx ctx;
 
         if (copy_from_user(&ctx, argp, sizeof(ctx)))
                 return -EFAULT;
@@ -475,8 +476,8 @@ int drm_modctx(struct inode *inode, struct file *filp,
 int drm_getctx(struct inode *inode, struct file *filp,
                unsigned int cmd, unsigned long arg)
 {
-        drm_ctx_t __user *argp = (void __user *)arg;
-        drm_ctx_t ctx;
+        struct drm_ctx __user *argp = (void __user *)arg;
+        struct drm_ctx ctx;
 
         if (copy_from_user(&ctx, argp, sizeof(ctx)))
                 return -EFAULT;
@@ -505,9 +506,9 @@ int drm_switchctx(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_ctx_t ctx;
+        struct drm_ctx ctx;
 
-        if (copy_from_user(&ctx, (drm_ctx_t __user *) arg, sizeof(ctx)))
+        if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx)))
                 return -EFAULT;
 
         DRM_DEBUG("%d\n", ctx.handle);
@@ -530,9 +531,9 @@ int drm_newctx(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_ctx_t ctx;
+        struct drm_ctx ctx;
 
-        if (copy_from_user(&ctx, (drm_ctx_t __user *) arg, sizeof(ctx)))
+        if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx)))
                 return -EFAULT;
 
         DRM_DEBUG("%d\n", ctx.handle);
@@ -557,9 +558,9 @@ int drm_rmctx(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_ctx_t ctx;
+        struct drm_ctx ctx;
 
-        if (copy_from_user(&ctx, (drm_ctx_t __user *) arg, sizeof(ctx)))
+        if (copy_from_user(&ctx, (struct drm_ctx __user *) arg, sizeof(ctx)))
                 return -EFAULT;
 
         DRM_DEBUG("%d\n", ctx.handle);
diff --git a/drivers/char/drm/drm_drawable.c b/drivers/char/drm/drm_drawable.c
index b33313be2547..87dabd994618 100644
--- a/drivers/char/drm/drm_drawable.c
+++ b/drivers/char/drm/drm_drawable.c
@@ -47,9 +47,9 @@ int drm_adddraw(DRM_IOCTL_ARGS)
         int i, j;
         u32 *bitfield = dev->drw_bitfield;
         unsigned int bitfield_length = dev->drw_bitfield_length;
-        drm_drawable_info_t **info = dev->drw_info;
+        struct drm_drawable_info **info = dev->drw_info;
         unsigned int info_length = dev->drw_info_length;
-        drm_draw_t draw;
+        struct drm_draw draw;
 
         for (i = 0, j = 0; i < bitfield_length; i++) {
                 if (bitfield[i] == ~0)
@@ -120,7 +120,7 @@ done:
 
         spin_unlock_irqrestore(&dev->drw_lock, irqflags);
 
-        DRM_COPY_TO_USER_IOCTL((drm_draw_t __user *)data, draw, sizeof(draw));
+        DRM_COPY_TO_USER_IOCTL((struct drm_draw __user *)data, draw, sizeof(draw));
 
         return 0;
 }
@@ -131,16 +131,16 @@ done:
 int drm_rmdraw(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
-        drm_draw_t draw;
+        struct drm_draw draw;
         int id, idx;
         unsigned int shift;
         unsigned long irqflags;
         u32 *bitfield = dev->drw_bitfield;
         unsigned int bitfield_length = dev->drw_bitfield_length;
-        drm_drawable_info_t **info = dev->drw_info;
+        struct drm_drawable_info **info = dev->drw_info;
         unsigned int info_length = dev->drw_info_length;
 
-        DRM_COPY_FROM_USER_IOCTL(draw, (drm_draw_t __user *) data,
+        DRM_COPY_FROM_USER_IOCTL(draw, (struct drm_draw __user *) data,
                                  sizeof(draw));
 
         id = draw.handle - 1;
@@ -161,7 +161,7 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 
         if (info[id]) {
                 drm_free(info[id]->rects, info[id]->num_rects *
-                         sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
+                         sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
                 drm_free(info[id], sizeof(**info), DRM_MEM_BUFS);
         }
 
@@ -230,15 +230,15 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 
 int drm_update_drawable_info(DRM_IOCTL_ARGS) {
         DRM_DEVICE;
-        drm_update_draw_t update;
+        struct drm_update_draw update;
         unsigned int id, idx, shift;
         u32 *bitfield = dev->drw_bitfield;
         unsigned long irqflags, bitfield_length = dev->drw_bitfield_length;
-        drm_drawable_info_t *info;
-        drm_clip_rect_t *rects;
+        struct drm_drawable_info *info;
+        struct drm_clip_rect *rects;
         int err;
 
-        DRM_COPY_FROM_USER_IOCTL(update, (drm_update_draw_t __user *) data,
+        DRM_COPY_FROM_USER_IOCTL(update, (struct drm_update_draw __user *) data,
                                  sizeof(update));
 
         id = update.handle - 1;
@@ -254,7 +254,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) {
         info = dev->drw_info[id];
 
         if (!info) {
-                info = drm_calloc(1, sizeof(drm_drawable_info_t), DRM_MEM_BUFS);
+                info = drm_calloc(1, sizeof(struct drm_drawable_info), DRM_MEM_BUFS);
 
                 if (!info) {
                         DRM_ERROR("Failed to allocate drawable info memory\n");
@@ -265,7 +265,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) {
         switch (update.type) {
         case DRM_DRAWABLE_CLIPRECTS:
                 if (update.num != info->num_rects) {
-                        rects = drm_alloc(update.num * sizeof(drm_clip_rect_t),
+                        rects = drm_alloc(update.num * sizeof(struct drm_clip_rect),
                                          DRM_MEM_BUFS);
                 } else
                         rects = info->rects;
@@ -277,7 +277,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) {
                 }
 
                 if (update.num && DRM_COPY_FROM_USER(rects,
-                                                     (drm_clip_rect_t __user *)
+                                                     (struct drm_clip_rect __user *)
                                                      (unsigned long)update.data,
                                                      update.num *
                                                      sizeof(*rects))) {
@@ -290,7 +290,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) {
 
                 if (rects != info->rects) {
                         drm_free(info->rects, info->num_rects *
-                                 sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
+                                 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
                 }
 
                 info->rects = rects;
@@ -314,7 +314,7 @@ error:
                 drm_free(info, sizeof(*info), DRM_MEM_BUFS);
         else if (rects != dev->drw_info[id]->rects)
                 drm_free(rects, update.num *
-                         sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
+                         sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
 
         return err;
 }
@@ -322,7 +322,7 @@ error:
 /**
  * Caller must hold the drawable spinlock!
  */
-drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev, drm_drawable_t id) {
+struct drm_drawable_info *drm_get_drawable_info(drm_device_t *dev, drm_drawable_t id) {
         u32 *bitfield = dev->drw_bitfield;
         unsigned int idx, shift;
 
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index 63e091071eb2..4036c7cf7c05 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -154,11 +154,11 @@ int drm_lastclose(drm_device_t * dev)
         /* Free drawable information memory */
         for (i = 0; i < dev->drw_bitfield_length / sizeof(*dev->drw_bitfield);
              i++) {
-                drm_drawable_info_t *info = drm_get_drawable_info(dev, i);
+                struct drm_drawable_info *info = drm_get_drawable_info(dev, i);
 
                 if (info) {
                         drm_free(info->rects, info->num_rects *
-                                 sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
+                                 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
                         drm_free(info, sizeof(*info), DRM_MEM_BUFS);
                 }
         }
@@ -432,8 +432,8 @@ static int drm_version(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_version_t __user *argp = (void __user *)arg;
-        drm_version_t version;
+        struct drm_version __user *argp = (void __user *)arg;
+        struct drm_version version;
         int len;
 
         if (copy_from_user(&version, argp, sizeof(version)))
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
index 96b982f1f4a4..afc355318f6a 100644
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -54,8 +54,8 @@ int drm_getunique(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_unique_t __user *argp = (void __user *)arg;
-        drm_unique_t u;
+        struct drm_unique __user *argp = (void __user *)arg;
+        struct drm_unique u;
 
         if (copy_from_user(&u, argp, sizeof(u)))
                 return -EFAULT;
@@ -88,13 +88,13 @@ int drm_setunique(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_unique_t u;
+        struct drm_unique u;
         int domain, bus, slot, func, ret;
 
         if (dev->unique_len || dev->unique)
                 return -EBUSY;
 
-        if (copy_from_user(&u, (drm_unique_t __user *) arg, sizeof(u)))
+        if (copy_from_user(&u, (struct drm_unique __user *) arg, sizeof(u)))
                 return -EFAULT;
 
         if (!u.unique_len || u.unique_len > 1024)
@@ -186,8 +186,8 @@ int drm_getmap(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_map_t __user *argp = (void __user *)arg;
-        drm_map_t map;
+        struct drm_map __user *argp = (void __user *)arg;
+        struct drm_map map;
         drm_map_list_t *r_list = NULL;
         struct list_head *list;
         int idx;
@@ -247,8 +247,8 @@ int drm_getclient(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_client_t __user *argp = (drm_client_t __user *)arg;
-        drm_client_t client;
+        struct drm_client __user *argp = (struct drm_client __user *)arg;
+        struct drm_client client;
         drm_file_t *pt;
         int idx;
         int i;
@@ -296,7 +296,7 @@ int drm_getstats(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_stats_t stats;
+        struct drm_stats stats;
         int i;
 
         memset(&stats, 0, sizeof(stats));
@@ -316,7 +316,7 @@ int drm_getstats(struct inode *inode, struct file *filp,
 
         mutex_unlock(&dev->struct_mutex);
 
-        if (copy_to_user((drm_stats_t __user *) arg, &stats, sizeof(stats)))
+        if (copy_to_user((struct drm_stats __user *) arg, &stats, sizeof(stats)))
                 return -EFAULT;
         return 0;
 }
@@ -335,10 +335,10 @@ int drm_getstats(struct inode *inode, struct file *filp,
 int drm_setversion(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
-        drm_set_version_t sv;
-        drm_set_version_t retv;
+        struct drm_set_version sv;
+        struct drm_set_version retv;
         int if_version;
-        drm_set_version_t __user *argp = (void __user *)data;
+        struct drm_set_version __user *argp = (void __user *)data;
         int ret;
 
         if (copy_from_user(&sv, argp, sizeof(sv)))
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index ae3053ce7b2c..6b2b3d626ced 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -55,8 +55,8 @@ int drm_irq_by_busid(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_irq_busid_t __user *argp = (void __user *)arg;
-        drm_irq_busid_t p;
+        struct drm_irq_busid __user *argp = (void __user *)arg;
+        struct drm_irq_busid p;
 
         if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                 return -EINVAL;
@@ -199,11 +199,11 @@ int drm_control(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_control_t ctl;
+        struct drm_control ctl;
 
         /* if we haven't irq we fallback for compatibility reasons - this used to be a separate function in drm_dma.h */
 
-        if (copy_from_user(&ctl, (drm_control_t __user *) arg, sizeof(ctl)))
+        if (copy_from_user(&ctl, (struct drm_control __user *) arg, sizeof(ctl)))
                 return -EFAULT;
 
         switch (ctl.func) {
@@ -246,8 +246,8 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_wait_vblank_t __user *argp = (void __user *)data;
-        drm_wait_vblank_t vblwait;
+        union drm_wait_vblank __user *argp = (void __user *)data;
+        union drm_wait_vblank vblwait;
         struct timeval now;
         int ret = 0;
         unsigned int flags, seq;
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index befd1af19dfe..62f12e745249 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -54,12 +54,12 @@ int drm_lock(struct inode *inode, struct file *filp,
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         DECLARE_WAITQUEUE(entry, current);
-        drm_lock_t lock;
+        struct drm_lock lock;
         int ret = 0;
 
         ++priv->lock_count;
 
-        if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock)))
+        if (copy_from_user(&lock, (struct drm_lock __user *) arg, sizeof(lock)))
                 return -EFAULT;
 
         if (lock.context == DRM_KERNEL_CONTEXT) {
@@ -154,10 +154,10 @@ int drm_unlock(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_lock_t lock;
+        struct drm_lock lock;
         unsigned long irqflags;
 
-        if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock)))
+        if (copy_from_user(&lock, (struct drm_lock __user *) arg, sizeof(lock)))
                 return -EFAULT;
 
         if (lock.context == DRM_KERNEL_CONTEXT) {
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 1b1735ab3fbf..0bd935768ce2 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -207,7 +207,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
 {
         drm_device_t *dev = (drm_device_t *) data;
         int len = 0;
-        drm_map_t *map;
+        struct drm_map *map;
         drm_map_list_t *r_list;
 
         /* Hardcoded from _DRM_FRAME_BUFFER,
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h
index e94297b751b8..6964d1e9bb3a 100644
--- a/drivers/char/drm/drm_sarea.h
+++ b/drivers/char/drm/drm_sarea.h
@@ -67,9 +67,9 @@ typedef struct drm_sarea_frame {
 /** SAREA */
 typedef struct drm_sarea {
     /** first thing is always the DRM locking structure */
-        drm_hw_lock_t lock;
+        struct drm_hw_lock lock;
     /** \todo Use readers/writer lock for drm_sarea::drawable_lock */
-        drm_hw_lock_t drawable_lock;
+        struct drm_hw_lock drawable_lock;
         drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES];        /**< drawables */
         drm_sarea_frame_t frame;        /**< frame */
         drm_context_t dummy_context;
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index 06ef7ddbe67d..6d8947a274ef 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -67,8 +67,8 @@ int drm_sg_alloc(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_scatter_gather_t __user *argp = (void __user *)arg;
-        drm_scatter_gather_t request;
+        struct drm_scatter_gather __user *argp = (void __user *)arg;
+        struct drm_scatter_gather request;
         drm_sg_mem_t *entry;
         unsigned long pages, i, j;
 
@@ -203,14 +203,14 @@ int drm_sg_free(struct inode *inode, struct file *filp,
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_scatter_gather_t request;
+        struct drm_scatter_gather request;
         drm_sg_mem_t *entry;
 
         if (!drm_core_check_feature(dev, DRIVER_SG))
                 return -EINVAL;
 
         if (copy_from_user(&request,
-                           (drm_scatter_gather_t __user *) arg,
+                           (struct drm_scatter_gather __user *) arg,
                            sizeof(request)))
                 return -EFAULT;
 
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 948e60d272df..13bdb1393c36 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -81,7 +81,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
 {
         drm_file_t *priv = vma->vm_file->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_map_t *map = NULL;
+        struct drm_map *map = NULL;
         drm_map_list_t *r_list;
         drm_hash_item_t *hash;
 
@@ -163,7 +163,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
 static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
                                                     unsigned long address)
 {
-        drm_map_t *map = (drm_map_t *) vma->vm_private_data;
+        struct drm_map *map = (struct drm_map *) vma->vm_private_data;
         unsigned long offset;
         unsigned long i;
         struct page *page;
@@ -197,7 +197,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
         drm_file_t *priv = vma->vm_file->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_vma_entry_t *pt, *temp;
-        drm_map_t *map;
+        struct drm_map *map;
         drm_map_list_t *r_list;
         int found_maps = 0;
 
@@ -310,7 +310,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
 static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
                                                    unsigned long address)
 {
-        drm_map_t *map = (drm_map_t *) vma->vm_private_data;
+        struct drm_map *map = (struct drm_map *) vma->vm_private_data;
         drm_file_t *priv = vma->vm_file->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_sg_mem_t *entry = dev->sg;
@@ -512,7 +512,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
         return 0;
 }
 
-unsigned long drm_core_get_map_ofs(drm_map_t * map)
+unsigned long drm_core_get_map_ofs(struct drm_map * map)
 {
         return map->offset;
 }
@@ -547,7 +547,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
 {
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
-        drm_map_t *map = NULL;
+        struct drm_map *map = NULL;
         unsigned long offset = 0;
         drm_hash_item_t *hash;
 
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 9ba114657c5e..977c74857383 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -397,11 +397,11 @@ static int i915_emit_cmds(drm_device_t * dev, int __user * buffer, int dwords)
 }
 
 static int i915_emit_box(drm_device_t * dev,
-                         drm_clip_rect_t __user * boxes,
+                         struct drm_clip_rect __user * boxes,
                          int i, int DR1, int DR4)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
-        drm_clip_rect_t box;
+        struct drm_clip_rect box;
         RING_LOCALS;
 
         if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) {
@@ -493,7 +493,7 @@ static int i915_dispatch_batchbuffer(drm_device_t * dev,
                                      drm_i915_batchbuffer_t * batch)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
-        drm_clip_rect_t __user *boxes = batch->cliprects;
+        struct drm_clip_rect __user *boxes = batch->cliprects;
         int nbox = batch->num_cliprects;
         int i = 0, count;
         RING_LOCALS;
@@ -625,7 +625,7 @@ static int i915_batchbuffer(DRM_IOCTL_ARGS)
 
         if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects,
                                                        batch.num_cliprects *
-                                                       sizeof(drm_clip_rect_t)))
+                                                       sizeof(struct drm_clip_rect)))
                 return DRM_ERR(EFAULT);
 
         ret = i915_dispatch_batchbuffer(dev, &batch);
@@ -655,7 +655,7 @@ static int i915_cmdbuffer(DRM_IOCTL_ARGS)
         if (cmdbuf.num_cliprects &&
             DRM_VERIFYAREA_READ(cmdbuf.cliprects,
                                 cmdbuf.num_cliprects *
-                                sizeof(drm_clip_rect_t))) {
+                                sizeof(struct drm_clip_rect))) {
                 DRM_ERROR("Fault accessing cliprects\n");
                 return DRM_ERR(EFAULT);
         }
diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h
index 7b7b68b96f31..05c66cf03a9e 100644
--- a/drivers/char/drm/i915_drm.h
+++ b/drivers/char/drm/i915_drm.h
@@ -64,7 +64,7 @@ typedef struct _drm_i915_init {
 } drm_i915_init_t;
 
 typedef struct _drm_i915_sarea {
-        drm_tex_region_t texList[I915_NR_TEX_REGIONS + 1];
+        struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
         int last_upload;        /* last time texture was uploaded */
         int last_enqueue;       /* last time a buffer was enqueued */
         int last_dispatch;      /* age of the most recently dispatched buffer */
@@ -170,7 +170,7 @@ typedef struct _drm_i915_batchbuffer {
         int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
         int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
         int num_cliprects;      /* mulitpass with multiple cliprects? */
-        drm_clip_rect_t __user *cliprects;      /* pointer to userspace cliprects */
+        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
 } drm_i915_batchbuffer_t;
 
 /* As above, but pass a pointer to userspace buffer which can be
@@ -182,7 +182,7 @@ typedef struct _drm_i915_cmdbuffer {
         int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
         int DR4;                /* window origin for GFX_OP_DRAWRECT_INFO */
         int num_cliprects;      /* mulitpass with multiple cliprects? */
-        drm_clip_rect_t __user *cliprects;      /* pointer to userspace cliprects */
+        struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */
 } drm_i915_cmdbuffer_t;
 
 /* Userspace can request & wait on irq's:
@@ -259,7 +259,7 @@ typedef struct drm_i915_vblank_pipe {
  */
 typedef struct drm_i915_vblank_swap {
         drm_drawable_t drawable;
-        drm_vblank_seq_type_t seqtype;
+        enum drm_vblank_seq_type seqtype;
         unsigned int sequence;
 } drm_i915_vblank_swap_t;
 
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index b92062a239f1..a5989315ec8c 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -50,7 +50,7 @@ static void i915_vblank_tasklet(drm_device_t *dev)
         int nhits, nrects, slice[2], upper[2], lower[2], i;
         unsigned counter[2] = { atomic_read(&dev->vbl_received),
                                 atomic_read(&dev->vbl_received2) };
-        drm_drawable_info_t *drw;
+        struct drm_drawable_info *drw;
         drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
         u32 cpp = dev_priv->cpp;
         u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
@@ -95,7 +95,7 @@ static void i915_vblank_tasklet(drm_device_t *dev)
                 list_for_each(hit, &hits) {
                         drm_i915_vbl_swap_t *swap_cmp =
                                 list_entry(hit, drm_i915_vbl_swap_t, head);
-                        drm_drawable_info_t *drw_cmp =
+                        struct drm_drawable_info *drw_cmp =
                                 drm_get_drawable_info(dev, swap_cmp->drw_id);
 
                         if (drw_cmp &&
@@ -160,7 +160,7 @@ static void i915_vblank_tasklet(drm_device_t *dev)
                 list_for_each(hit, &hits) {
                         drm_i915_vbl_swap_t *swap_hit =
                                 list_entry(hit, drm_i915_vbl_swap_t, head);
-                        drm_clip_rect_t *rect;
+                        struct drm_clip_rect *rect;
                         int num_rects, pipe;
                         unsigned short top, bottom;
 
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index 52c67324df58..c0ee1dae82c3 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -47,7 +47,7 @@ static void mark_block(drm_device_t * dev, struct mem_block *p, int in_use)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
         drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
-        drm_tex_region_t *list;
+        struct drm_tex_region *list;
         unsigned shift, nr;
         unsigned start;
         unsigned end;
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index 28fbf3dda28d..4a517cc133b7 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -55,7 +55,7 @@ static const int r300_cliprect_cntl[4] = {
 static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                                drm_radeon_kcmd_buffer_t *cmdbuf, int n)
 {
-        drm_clip_rect_t box;
+        struct drm_clip_rect box;
         int nr;
         int i;
         RING_LOCALS;
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 7dd980055229..cfc5aa16de22 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -2171,7 +2171,7 @@ int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n)
 }
 
 static int radeon_cp_get_buffers(DRMFILE filp, drm_device_t * dev,
-                                 drm_dma_t * d)
+                                 struct drm_dma * d)
 {
         int i;
         drm_buf_t *buf;
@@ -2200,8 +2200,8 @@ int radeon_cp_buffers(DRM_IOCTL_ARGS)
         DRM_DEVICE;
         drm_device_dma_t *dma = dev->dma;
         int ret = 0;
-        drm_dma_t __user *argp = (void __user *)data;
-        drm_dma_t d;
+        struct drm_dma __user *argp = (void __user *)data;
+        struct drm_dma d;
 
         LOCK_TEST_WITH_RETURN(dev, filp);
 
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h
index 04de7a15df99..5a8e23f916fc 100644
--- a/drivers/char/drm/radeon_drm.h
+++ b/drivers/char/drm/radeon_drm.h
@@ -417,7 +417,7 @@ typedef struct {
 
         /* The current cliprects, or a subset thereof.
          */
-        drm_clip_rect_t boxes[RADEON_NR_SAREA_CLIPRECTS];
+        struct drm_clip_rect boxes[RADEON_NR_SAREA_CLIPRECTS];
         unsigned int nbox;
 
         /* Counters for client-side throttling of rendering clients.
@@ -426,7 +426,7 @@ typedef struct {
         unsigned int last_dispatch;
         unsigned int last_clear;
 
-        drm_tex_region_t tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS +
+        struct drm_tex_region tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS +
                                                        1];
         unsigned int tex_age[RADEON_NR_TEX_HEAPS];
         int ctx_owner;
@@ -604,7 +604,7 @@ typedef struct drm_radeon_cmd_buffer {
         int bufsz;
         char __user *buf;
         int nbox;
-        drm_clip_rect_t __user *boxes;
+        struct drm_clip_rect __user *boxes;
 } drm_radeon_cmd_buffer_t;
 
 typedef struct drm_radeon_tex_image {
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 4422ae3a68bc..e4b4e4be9bb5 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -303,7 +303,7 @@ typedef struct drm_radeon_kcmd_buffer {
         int bufsz;
         char *buf;
         int nbox;
-        drm_clip_rect_t __user *boxes;
+        struct drm_clip_rect __user *boxes;
 } drm_radeon_kcmd_buffer_t;
 
 extern int radeon_no_wb;
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 5b89e471bc71..348a89e05812 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -421,7 +421,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
  */
 
 static __inline__ void radeon_emit_clip_rect(drm_radeon_private_t * dev_priv,
-                                             drm_clip_rect_t * box)
+                                             struct drm_clip_rect * box)
 {
         RING_LOCALS;
 
@@ -852,7 +852,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev,
         drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
         drm_radeon_depth_clear_t *depth_clear = &dev_priv->depth_clear;
         int nbox = sarea_priv->nbox;
-        drm_clip_rect_t *pbox = sarea_priv->boxes;
+        struct drm_clip_rect *pbox = sarea_priv->boxes;
         unsigned int flags = clear->flags;
         u32 rb3d_cntl = 0, rb3d_stencilrefmask = 0;
         int i;
@@ -1340,7 +1340,7 @@ static void radeon_cp_dispatch_swap(drm_device_t * dev)
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_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 i;
         RING_LOCALS;
         DRM_DEBUG("\n");
@@ -2760,10 +2760,10 @@ static int radeon_emit_packet3_cliprect(drm_device_t *dev,
                                         int orig_nbox)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_clip_rect_t box;
+        struct drm_clip_rect box;
         unsigned int cmdsz;
         int ret;
-        drm_clip_rect_t __user *boxes = cmdbuf->boxes;
+        struct drm_clip_rect __user *boxes = cmdbuf->boxes;
         int i = 0;
         RING_LOCALS;
 
diff --git a/drivers/char/drm/via_drm.h b/drivers/char/drm/via_drm.h
index e4ee97d7156f..8f53c76062e9 100644
--- a/drivers/char/drm/via_drm.h
+++ b/drivers/char/drm/via_drm.h
@@ -40,7 +40,7 @@
 #define VIA_NR_XVMC_LOCKS               5
 #define VIA_MAX_CACHELINE_SIZE          64
 #define XVMCLOCKPTR(saPriv,lockNo)                                      \
-        ((volatile drm_hw_lock_t *)(((((unsigned long) (saPriv)->XvMCLockArea) + \
+        ((volatile struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \
                                       (VIA_MAX_CACHELINE_SIZE - 1)) &   \
                                      ~(VIA_MAX_CACHELINE_SIZE - 1)) +   \
                                     VIA_MAX_CACHELINE_SIZE*(lockNo)))
@@ -182,7 +182,7 @@ typedef struct _drm_via_tex_region {
 typedef struct _drm_via_sarea {
         unsigned int dirty;
         unsigned int nbox;
-        drm_clip_rect_t boxes[VIA_NR_SAREA_CLIPRECTS];
+        struct drm_clip_rect boxes[VIA_NR_SAREA_CLIPRECTS];
         drm_via_tex_region_t texList[VIA_NR_TEX_REGIONS + 1];
         int texAge;             /* last time texture was uploaded */
         int ctxOwner;           /* last context to upload state */