diff options
Diffstat (limited to 'drivers/char/drm/drm_auth.c')
-rw-r--r-- | drivers/char/drm/drm_auth.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/char/drm/drm_auth.c b/drivers/char/drm/drm_auth.c index 16e6f0e93b20..905b8bda700d 100644 --- a/drivers/char/drm/drm_auth.c +++ b/drivers/char/drm/drm_auth.c | |||
@@ -45,9 +45,9 @@ | |||
45 | * the one with matching magic number, while holding the drm_device::struct_mutex | 45 | * the one with matching magic number, while holding the drm_device::struct_mutex |
46 | * lock. | 46 | * lock. |
47 | */ | 47 | */ |
48 | static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic) | 48 | static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic) |
49 | { | 49 | { |
50 | drm_file_t *retval = NULL; | 50 | struct drm_file *retval = NULL; |
51 | drm_magic_entry_t *pt; | 51 | drm_magic_entry_t *pt; |
52 | drm_hash_item_t *hash; | 52 | drm_hash_item_t *hash; |
53 | 53 | ||
@@ -71,7 +71,7 @@ static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic) | |||
71 | * associated the magic number hash key in drm_device::magiclist, while holding | 71 | * associated the magic number hash key in drm_device::magiclist, while holding |
72 | * the drm_device::struct_mutex lock. | 72 | * the drm_device::struct_mutex lock. |
73 | */ | 73 | */ |
74 | static int drm_add_magic(drm_device_t * dev, drm_file_t * priv, | 74 | static 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 | drm_magic_entry_t *entry; |
@@ -102,7 +102,7 @@ static int drm_add_magic(drm_device_t * dev, drm_file_t * priv, | |||
102 | * Searches and unlinks the entry in drm_device::magiclist with the magic | 102 | * Searches and unlinks the entry in drm_device::magiclist with the magic |
103 | * number hash key, while holding the drm_device::struct_mutex lock. | 103 | * number hash key, while holding the drm_device::struct_mutex lock. |
104 | */ | 104 | */ |
105 | static int drm_remove_magic(drm_device_t * dev, drm_magic_t magic) | 105 | static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic) |
106 | { | 106 | { |
107 | drm_magic_entry_t *pt; | 107 | drm_magic_entry_t *pt; |
108 | drm_hash_item_t *hash; | 108 | drm_hash_item_t *hash; |
@@ -142,8 +142,8 @@ int drm_getmagic(struct inode *inode, struct file *filp, | |||
142 | { | 142 | { |
143 | static drm_magic_t sequence = 0; | 143 | static drm_magic_t sequence = 0; |
144 | static DEFINE_SPINLOCK(lock); | 144 | static DEFINE_SPINLOCK(lock); |
145 | drm_file_t *priv = filp->private_data; | 145 | struct drm_file *priv = filp->private_data; |
146 | drm_device_t *dev = priv->head->dev; | 146 | struct drm_device *dev = priv->head->dev; |
147 | struct drm_auth auth; | 147 | struct drm_auth auth; |
148 | 148 | ||
149 | /* Find unique magic */ | 149 | /* Find unique magic */ |
@@ -181,10 +181,10 @@ int drm_getmagic(struct inode *inode, struct file *filp, | |||
181 | int drm_authmagic(struct inode *inode, struct file *filp, | 181 | int drm_authmagic(struct inode *inode, struct file *filp, |
182 | unsigned int cmd, unsigned long arg) | 182 | unsigned int cmd, unsigned long arg) |
183 | { | 183 | { |
184 | drm_file_t *priv = filp->private_data; | 184 | struct drm_file *priv = filp->private_data; |
185 | drm_device_t *dev = priv->head->dev; | 185 | struct drm_device *dev = priv->head->dev; |
186 | struct drm_auth auth; | 186 | struct drm_auth auth; |
187 | drm_file_t *file; | 187 | struct drm_file *file; |
188 | 188 | ||
189 | if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth))) | 189 | if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth))) |
190 | return -EFAULT; | 190 | return -EFAULT; |