aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_auth.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-11 02:21:47 -0400
committerDave Airlie <airlied@linux.ie>2007-07-11 02:21:47 -0400
commit8fc2fdf4c9437576f38e97c2f5b700ec77038984 (patch)
treed5770478cb93b8ecc0dfa09734887d474cae799b /drivers/char/drm/drm_auth.c
parent056219e2fa6664ec83bc258ebcf30f1a7919d423 (diff)
drm: drop drm_vma_entry_t, drm_magic_entry_t
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_auth.c')
-rw-r--r--drivers/char/drm/drm_auth.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_auth.c b/drivers/char/drm/drm_auth.c
index 905b8bda700d..52c635485304 100644
--- a/drivers/char/drm/drm_auth.c
+++ b/drivers/char/drm/drm_auth.c
@@ -48,12 +48,12 @@
48static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic) 48static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic)
49{ 49{
50 struct drm_file *retval = NULL; 50 struct drm_file *retval = NULL;
51 drm_magic_entry_t *pt; 51 struct drm_magic_entry *pt;
52 drm_hash_item_t *hash; 52 drm_hash_item_t *hash;
53 53
54 mutex_lock(&dev->struct_mutex); 54 mutex_lock(&dev->struct_mutex);
55 if (!drm_ht_find_item(&dev->magiclist, (unsigned long)magic, &hash)) { 55 if (!drm_ht_find_item(&dev->magiclist, (unsigned long)magic, &hash)) {
56 pt = drm_hash_entry(hash, drm_magic_entry_t, hash_item); 56 pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);
57 retval = pt->priv; 57 retval = pt->priv;
58 } 58 }
59 mutex_unlock(&dev->struct_mutex); 59 mutex_unlock(&dev->struct_mutex);
@@ -74,7 +74,7 @@ static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic
74static int drm_add_magic(struct drm_device * dev, struct drm_file * priv, 74static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,
75 drm_magic_t magic) 75 drm_magic_t magic)
76{ 76{
77 drm_magic_entry_t *entry; 77 struct drm_magic_entry *entry;
78 78
79 DRM_DEBUG("%d\n", magic); 79 DRM_DEBUG("%d\n", magic);
80 80
@@ -104,7 +104,7 @@ static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,
104 */ 104 */
105static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic) 105static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)
106{ 106{
107 drm_magic_entry_t *pt; 107 struct drm_magic_entry *pt;
108 drm_hash_item_t *hash; 108 drm_hash_item_t *hash;
109 109
110 DRM_DEBUG("%d\n", magic); 110 DRM_DEBUG("%d\n", magic);
@@ -114,7 +114,7 @@ static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)
114 mutex_unlock(&dev->struct_mutex); 114 mutex_unlock(&dev->struct_mutex);
115 return -EINVAL; 115 return -EINVAL;
116 } 116 }
117 pt = drm_hash_entry(hash, drm_magic_entry_t, hash_item); 117 pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);
118 drm_ht_remove_item(&dev->magiclist, hash); 118 drm_ht_remove_item(&dev->magiclist, hash);
119 list_del(&pt->head); 119 list_del(&pt->head);
120 mutex_unlock(&dev->struct_mutex); 120 mutex_unlock(&dev->struct_mutex);