diff options
Diffstat (limited to 'drivers/char/drm/drm_fops.c')
-rw-r--r-- | drivers/char/drm/drm_fops.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c index d4b4dce68ad2..ef2a28af136f 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/char/drm/drm_fops.c | |||
@@ -39,9 +39,9 @@ | |||
39 | #include <linux/poll.h> | 39 | #include <linux/poll.h> |
40 | 40 | ||
41 | static int drm_open_helper(struct inode *inode, struct file *filp, | 41 | static int drm_open_helper(struct inode *inode, struct file *filp, |
42 | drm_device_t * dev); | 42 | struct drm_device * dev); |
43 | 43 | ||
44 | static int drm_setup(drm_device_t * dev) | 44 | static int drm_setup(struct drm_device * dev) |
45 | { | 45 | { |
46 | drm_local_map_t *map; | 46 | drm_local_map_t *map; |
47 | int i; | 47 | int i; |
@@ -128,7 +128,7 @@ static int drm_setup(drm_device_t * dev) | |||
128 | */ | 128 | */ |
129 | int drm_open(struct inode *inode, struct file *filp) | 129 | int drm_open(struct inode *inode, struct file *filp) |
130 | { | 130 | { |
131 | drm_device_t *dev = NULL; | 131 | struct drm_device *dev = NULL; |
132 | int minor = iminor(inode); | 132 | int minor = iminor(inode); |
133 | int retcode = 0; | 133 | int retcode = 0; |
134 | 134 | ||
@@ -167,7 +167,7 @@ EXPORT_SYMBOL(drm_open); | |||
167 | */ | 167 | */ |
168 | int drm_stub_open(struct inode *inode, struct file *filp) | 168 | int drm_stub_open(struct inode *inode, struct file *filp) |
169 | { | 169 | { |
170 | drm_device_t *dev = NULL; | 170 | struct drm_device *dev = NULL; |
171 | int minor = iminor(inode); | 171 | int minor = iminor(inode); |
172 | int err = -ENODEV; | 172 | int err = -ENODEV; |
173 | const struct file_operations *old_fops; | 173 | const struct file_operations *old_fops; |
@@ -223,10 +223,10 @@ static int drm_cpu_valid(void) | |||
223 | * filp and add it into the double linked list in \p dev. | 223 | * filp and add it into the double linked list in \p dev. |
224 | */ | 224 | */ |
225 | static int drm_open_helper(struct inode *inode, struct file *filp, | 225 | static int drm_open_helper(struct inode *inode, struct file *filp, |
226 | drm_device_t * dev) | 226 | struct drm_device * dev) |
227 | { | 227 | { |
228 | int minor = iminor(inode); | 228 | int minor = iminor(inode); |
229 | drm_file_t *priv; | 229 | struct drm_file *priv; |
230 | int ret; | 230 | int ret; |
231 | 231 | ||
232 | if (filp->f_flags & O_EXCL) | 232 | if (filp->f_flags & O_EXCL) |
@@ -295,8 +295,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp, | |||
295 | /** No-op. */ | 295 | /** No-op. */ |
296 | int drm_fasync(int fd, struct file *filp, int on) | 296 | int drm_fasync(int fd, struct file *filp, int on) |
297 | { | 297 | { |
298 | drm_file_t *priv = filp->private_data; | 298 | struct drm_file *priv = filp->private_data; |
299 | drm_device_t *dev = priv->head->dev; | 299 | struct drm_device *dev = priv->head->dev; |
300 | int retcode; | 300 | int retcode; |
301 | 301 | ||
302 | DRM_DEBUG("fd = %d, device = 0x%lx\n", fd, | 302 | DRM_DEBUG("fd = %d, device = 0x%lx\n", fd, |
@@ -322,8 +322,8 @@ EXPORT_SYMBOL(drm_fasync); | |||
322 | */ | 322 | */ |
323 | int drm_release(struct inode *inode, struct file *filp) | 323 | int drm_release(struct inode *inode, struct file *filp) |
324 | { | 324 | { |
325 | drm_file_t *priv = filp->private_data; | 325 | struct drm_file *priv = filp->private_data; |
326 | drm_device_t *dev; | 326 | struct drm_device *dev; |
327 | int retcode = 0; | 327 | int retcode = 0; |
328 | 328 | ||
329 | lock_kernel(); | 329 | lock_kernel(); |
@@ -422,7 +422,7 @@ int drm_release(struct inode *inode, struct file *filp) | |||
422 | 422 | ||
423 | mutex_lock(&dev->struct_mutex); | 423 | mutex_lock(&dev->struct_mutex); |
424 | if (priv->remove_auth_on_close == 1) { | 424 | if (priv->remove_auth_on_close == 1) { |
425 | drm_file_t *temp; | 425 | struct drm_file *temp; |
426 | 426 | ||
427 | list_for_each_entry(temp, &dev->filelist, lhead) | 427 | list_for_each_entry(temp, &dev->filelist, lhead) |
428 | temp->authenticated = 0; | 428 | temp->authenticated = 0; |