diff options
Diffstat (limited to 'drivers/char/drm/drm_proc.c')
-rw-r--r-- | drivers/char/drm/drm_proc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c index 0bd935768ce2..383287449282 100644 --- a/drivers/char/drm/drm_proc.c +++ b/drivers/char/drm/drm_proc.c | |||
@@ -87,7 +87,7 @@ static struct drm_proc_list { | |||
87 | * "/proc/dri/%minor%/", and each entry in proc_list as | 87 | * "/proc/dri/%minor%/", and each entry in proc_list as |
88 | * "/proc/dri/%minor%/%name%". | 88 | * "/proc/dri/%minor%/%name%". |
89 | */ | 89 | */ |
90 | int drm_proc_init(drm_device_t * dev, int minor, | 90 | int drm_proc_init(struct drm_device * dev, int minor, |
91 | struct proc_dir_entry *root, struct proc_dir_entry **dev_root) | 91 | struct proc_dir_entry *root, struct proc_dir_entry **dev_root) |
92 | { | 92 | { |
93 | struct proc_dir_entry *ent; | 93 | struct proc_dir_entry *ent; |
@@ -163,7 +163,7 @@ int drm_proc_cleanup(int minor, struct proc_dir_entry *root, | |||
163 | static int drm_name_info(char *buf, char **start, off_t offset, int request, | 163 | static int drm_name_info(char *buf, char **start, off_t offset, int request, |
164 | int *eof, void *data) | 164 | int *eof, void *data) |
165 | { | 165 | { |
166 | drm_device_t *dev = (drm_device_t *) data; | 166 | struct drm_device *dev = (struct drm_device *) data; |
167 | int len = 0; | 167 | int len = 0; |
168 | 168 | ||
169 | if (offset > DRM_PROC_LIMIT) { | 169 | if (offset > DRM_PROC_LIMIT) { |
@@ -205,7 +205,7 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request, | |||
205 | static int drm__vm_info(char *buf, char **start, off_t offset, int request, | 205 | static int drm__vm_info(char *buf, char **start, off_t offset, int request, |
206 | int *eof, void *data) | 206 | int *eof, void *data) |
207 | { | 207 | { |
208 | drm_device_t *dev = (drm_device_t *) data; | 208 | struct drm_device *dev = (struct drm_device *) data; |
209 | int len = 0; | 209 | int len = 0; |
210 | struct drm_map *map; | 210 | struct drm_map *map; |
211 | drm_map_list_t *r_list; | 211 | drm_map_list_t *r_list; |
@@ -261,7 +261,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request, | |||
261 | static int drm_vm_info(char *buf, char **start, off_t offset, int request, | 261 | static int drm_vm_info(char *buf, char **start, off_t offset, int request, |
262 | int *eof, void *data) | 262 | int *eof, void *data) |
263 | { | 263 | { |
264 | drm_device_t *dev = (drm_device_t *) data; | 264 | struct drm_device *dev = (struct drm_device *) data; |
265 | int ret; | 265 | int ret; |
266 | 266 | ||
267 | mutex_lock(&dev->struct_mutex); | 267 | mutex_lock(&dev->struct_mutex); |
@@ -284,7 +284,7 @@ static int drm_vm_info(char *buf, char **start, off_t offset, int request, | |||
284 | static int drm__queues_info(char *buf, char **start, off_t offset, | 284 | static int drm__queues_info(char *buf, char **start, off_t offset, |
285 | int request, int *eof, void *data) | 285 | int request, int *eof, void *data) |
286 | { | 286 | { |
287 | drm_device_t *dev = (drm_device_t *) data; | 287 | struct drm_device *dev = (struct drm_device *) data; |
288 | int len = 0; | 288 | int len = 0; |
289 | int i; | 289 | int i; |
290 | drm_queue_t *q; | 290 | drm_queue_t *q; |
@@ -334,7 +334,7 @@ static int drm__queues_info(char *buf, char **start, off_t offset, | |||
334 | static int drm_queues_info(char *buf, char **start, off_t offset, int request, | 334 | static int drm_queues_info(char *buf, char **start, off_t offset, int request, |
335 | int *eof, void *data) | 335 | int *eof, void *data) |
336 | { | 336 | { |
337 | drm_device_t *dev = (drm_device_t *) data; | 337 | struct drm_device *dev = (struct drm_device *) data; |
338 | int ret; | 338 | int ret; |
339 | 339 | ||
340 | mutex_lock(&dev->struct_mutex); | 340 | mutex_lock(&dev->struct_mutex); |
@@ -357,7 +357,7 @@ static int drm_queues_info(char *buf, char **start, off_t offset, int request, | |||
357 | static int drm__bufs_info(char *buf, char **start, off_t offset, int request, | 357 | static int drm__bufs_info(char *buf, char **start, off_t offset, int request, |
358 | int *eof, void *data) | 358 | int *eof, void *data) |
359 | { | 359 | { |
360 | drm_device_t *dev = (drm_device_t *) data; | 360 | struct drm_device *dev = (struct drm_device *) data; |
361 | int len = 0; | 361 | int len = 0; |
362 | drm_device_dma_t *dma = dev->dma; | 362 | drm_device_dma_t *dma = dev->dma; |
363 | int i; | 363 | int i; |
@@ -406,7 +406,7 @@ static int drm__bufs_info(char *buf, char **start, off_t offset, int request, | |||
406 | static int drm_bufs_info(char *buf, char **start, off_t offset, int request, | 406 | static int drm_bufs_info(char *buf, char **start, off_t offset, int request, |
407 | int *eof, void *data) | 407 | int *eof, void *data) |
408 | { | 408 | { |
409 | drm_device_t *dev = (drm_device_t *) data; | 409 | struct drm_device *dev = (struct drm_device *) data; |
410 | int ret; | 410 | int ret; |
411 | 411 | ||
412 | mutex_lock(&dev->struct_mutex); | 412 | mutex_lock(&dev->struct_mutex); |
@@ -429,9 +429,9 @@ static int drm_bufs_info(char *buf, char **start, off_t offset, int request, | |||
429 | static int drm__clients_info(char *buf, char **start, off_t offset, | 429 | static int drm__clients_info(char *buf, char **start, off_t offset, |
430 | int request, int *eof, void *data) | 430 | int request, int *eof, void *data) |
431 | { | 431 | { |
432 | drm_device_t *dev = (drm_device_t *) data; | 432 | struct drm_device *dev = (struct drm_device *) data; |
433 | int len = 0; | 433 | int len = 0; |
434 | drm_file_t *priv; | 434 | struct drm_file *priv; |
435 | 435 | ||
436 | if (offset > DRM_PROC_LIMIT) { | 436 | if (offset > DRM_PROC_LIMIT) { |
437 | *eof = 1; | 437 | *eof = 1; |
@@ -462,7 +462,7 @@ static int drm__clients_info(char *buf, char **start, off_t offset, | |||
462 | static int drm_clients_info(char *buf, char **start, off_t offset, | 462 | static int drm_clients_info(char *buf, char **start, off_t offset, |
463 | int request, int *eof, void *data) | 463 | int request, int *eof, void *data) |
464 | { | 464 | { |
465 | drm_device_t *dev = (drm_device_t *) data; | 465 | struct drm_device *dev = (struct drm_device *) data; |
466 | int ret; | 466 | int ret; |
467 | 467 | ||
468 | mutex_lock(&dev->struct_mutex); | 468 | mutex_lock(&dev->struct_mutex); |
@@ -476,7 +476,7 @@ static int drm_clients_info(char *buf, char **start, off_t offset, | |||
476 | static int drm__vma_info(char *buf, char **start, off_t offset, int request, | 476 | static int drm__vma_info(char *buf, char **start, off_t offset, int request, |
477 | int *eof, void *data) | 477 | int *eof, void *data) |
478 | { | 478 | { |
479 | drm_device_t *dev = (drm_device_t *) data; | 479 | struct drm_device *dev = (struct drm_device *) data; |
480 | int len = 0; | 480 | int len = 0; |
481 | drm_vma_entry_t *pt; | 481 | drm_vma_entry_t *pt; |
482 | struct vm_area_struct *vma; | 482 | struct vm_area_struct *vma; |
@@ -535,7 +535,7 @@ static int drm__vma_info(char *buf, char **start, off_t offset, int request, | |||
535 | static int drm_vma_info(char *buf, char **start, off_t offset, int request, | 535 | static int drm_vma_info(char *buf, char **start, off_t offset, int request, |
536 | int *eof, void *data) | 536 | int *eof, void *data) |
537 | { | 537 | { |
538 | drm_device_t *dev = (drm_device_t *) data; | 538 | struct drm_device *dev = (struct drm_device *) data; |
539 | int ret; | 539 | int ret; |
540 | 540 | ||
541 | mutex_lock(&dev->struct_mutex); | 541 | mutex_lock(&dev->struct_mutex); |