1 files changed, 48 insertions, 49 deletions

diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index 83094c73da67..7fc055adec25 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -56,7 +56,7 @@
  * in drm_device::context_sareas, while holding the drm_device::struct_mutex
  * lock.
  */
-void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle)
+void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
 {
         if (ctx_handle < 0)
                 goto failed;
@@ -85,7 +85,7 @@ void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle)
  * drm_device::context_sareas to accommodate the new entry while holding the
  * drm_device::struct_mutex lock.
  */
-static int drm_ctxbitmap_next(drm_device_t * dev)
+static int drm_ctxbitmap_next(struct drm_device * dev)
 {
         int bit;
 
@@ -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 -
@@ -147,7 +147,7 @@ static int drm_ctxbitmap_next(drm_device_t * dev)
  * Allocates and initialize drm_device::ctx_bitmap and drm_device::context_sareas, while holding
  * the drm_device::struct_mutex lock.
  */
-int drm_ctxbitmap_init(drm_device_t * dev)
+int drm_ctxbitmap_init(struct drm_device * dev)
 {
         int i;
         int temp;
@@ -180,7 +180,7 @@ int drm_ctxbitmap_init(drm_device_t * dev)
  * Frees drm_device::ctx_bitmap and drm_device::context_sareas, while holding
  * the drm_device::struct_mutex lock.
  */
-void drm_ctxbitmap_cleanup(drm_device_t * dev)
+void drm_ctxbitmap_cleanup(struct drm_device * dev)
 {
         mutex_lock(&dev->struct_mutex);
         if (dev->context_sareas)
@@ -212,12 +212,12 @@ void drm_ctxbitmap_cleanup(drm_device_t * dev)
 int drm_getsareactx(struct inode *inode, struct file *filp,
                     unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
-        drm_ctx_priv_map_t __user *argp = (void __user *)arg;
-        drm_ctx_priv_map_t request;
-        drm_map_t *map;
-        drm_map_list_t *_entry;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
+        struct drm_ctx_priv_map __user *argp = (void __user *)arg;
+        struct drm_ctx_priv_map request;
+        struct drm_map *map;
+        struct drm_map_list *_entry;
 
         if (copy_from_user(&request, argp, sizeof(request)))
                 return -EFAULT;
@@ -233,7 +233,7 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
         mutex_unlock(&dev->struct_mutex);
 
         request.handle = NULL;
-        list_for_each_entry(_entry, &dev->maplist->head, head) {
+        list_for_each_entry(_entry, &dev->maplist, head) {
                 if (_entry->map == map) {
                         request.handle =
                             (void *)(unsigned long)_entry->user_token;
@@ -263,20 +263,19 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
 int drm_setsareactx(struct inode *inode, struct file *filp,
                     unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
-        drm_ctx_priv_map_t request;
-        drm_map_t *map = NULL;
-        drm_map_list_t *r_list = NULL;
-        struct list_head *list;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
+        struct drm_ctx_priv_map request;
+        struct drm_map *map = NULL;
+        struct drm_map_list *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);
-        list_for_each(list, &dev->maplist->head) {
-                r_list = list_entry(list, drm_map_list_t, head);
+        list_for_each_entry(r_list, &dev->maplist, head) {
                 if (r_list->map
                     && r_list->user_token == (unsigned long)request.handle)
                         goto found;
@@ -314,7 +313,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
  *
  * Attempt to set drm_device::context_flag.
  */
-static int drm_context_switch(drm_device_t * dev, int old, int new)
+static int drm_context_switch(struct drm_device * dev, int old, int new)
 {
         if (test_and_set_bit(0, &dev->context_flag)) {
                 DRM_ERROR("Reentering -- FIXME\n");
@@ -342,7 +341,7 @@ static int drm_context_switch(drm_device_t * dev, int old, int new)
  * hardware lock is held, clears the drm_device::context_flag and wakes up
  * drm_device::context_wait.
  */
-static int drm_context_switch_complete(drm_device_t * dev, int new)
+static int drm_context_switch_complete(struct drm_device * dev, int new)
 {
         dev->last_context = new;        /* PRE/POST: This is the _only_ writer. */
         dev->last_switch = jiffies;
@@ -372,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)))
@@ -409,11 +408,11 @@ int drm_resctx(struct inode *inode, struct file *filp,
 int drm_addctx(struct inode *inode, struct file *filp,
                unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
-        drm_ctx_list_t *ctx_entry;
-        drm_ctx_t __user *argp = (void __user *)arg;
-        drm_ctx_t ctx;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
+        struct drm_ctx_list *ctx_entry;
+        struct drm_ctx __user *argp = (void __user *)arg;
+        struct drm_ctx ctx;
 
         if (copy_from_user(&ctx, argp, sizeof(ctx)))
                 return -EFAULT;
@@ -449,7 +448,7 @@ int drm_addctx(struct inode *inode, struct file *filp,
         ctx_entry->tag = priv;
 
         mutex_lock(&dev->ctxlist_mutex);
-        list_add(&ctx_entry->head, &dev->ctxlist->head);
+        list_add(&ctx_entry->head, &dev->ctxlist);
         ++dev->ctx_count;
         mutex_unlock(&dev->ctxlist_mutex);
 
@@ -477,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,11 +504,11 @@ int drm_getctx(struct inode *inode, struct file *filp,
 int drm_switchctx(struct inode *inode, struct file *filp,
                   unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
-        drm_ctx_t ctx;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
+        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,11 +529,11 @@ int drm_switchctx(struct inode *inode, struct file *filp,
 int drm_newctx(struct inode *inode, struct file *filp,
                unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
-        drm_ctx_t ctx;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
+        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,11 +556,11 @@ int drm_newctx(struct inode *inode, struct file *filp,
 int drm_rmctx(struct inode *inode, struct file *filp,
               unsigned int cmd, unsigned long arg)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
-        drm_ctx_t ctx;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
+        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);
@@ -575,10 +574,10 @@ int drm_rmctx(struct inode *inode, struct file *filp,
         }
 
         mutex_lock(&dev->ctxlist_mutex);
-        if (!list_empty(&dev->ctxlist->head)) {
-                drm_ctx_list_t *pos, *n;
+        if (!list_empty(&dev->ctxlist)) {
+                struct drm_ctx_list *pos, *n;
 
-                list_for_each_entry_safe(pos, n, &dev->ctxlist->head, head) {
+                list_for_each_entry_safe(pos, n, &dev->ctxlist, head) {
                         if (pos->handle == ctx.handle) {
                                 list_del(&pos->head);
                                 drm_free(pos, sizeof(*pos), DRM_MEM_CTXLIST);