diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-10 22:05:36 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-10 22:05:36 -0400 |
commit | 7c158acef8f0e51c3a5f71133aaf402628370a64 (patch) | |
tree | 1a767cab78e759cf1e85068a7b1efcce01f6a2a8 | |
parent | 6f710105f5a4971078c46ae258cbb76db1ee967a (diff) |
drm: cleanup list initialisation
Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r-- | drivers/char/drm/drm_fops.c | 3 | ||||
-rw-r--r-- | drivers/char/drm/drm_stub.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c index e82e78fa42b0..d4b4dce68ad2 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/char/drm/drm_fops.c | |||
@@ -79,9 +79,6 @@ static int drm_setup(drm_device_t * dev) | |||
79 | drm_ht_create(&dev->magiclist, DRM_MAGIC_HASH_ORDER); | 79 | drm_ht_create(&dev->magiclist, DRM_MAGIC_HASH_ORDER); |
80 | INIT_LIST_HEAD(&dev->magicfree); | 80 | INIT_LIST_HEAD(&dev->magicfree); |
81 | 81 | ||
82 | INIT_LIST_HEAD(&dev->ctxlist); | ||
83 | INIT_LIST_HEAD(&dev->vmalist); | ||
84 | |||
85 | dev->sigdata.lock = NULL; | 82 | dev->sigdata.lock = NULL; |
86 | init_waitqueue_head(&dev->lock.lock_queue); | 83 | init_waitqueue_head(&dev->lock.lock_queue); |
87 | dev->queue_count = 0; | 84 | dev->queue_count = 0; |
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 59a9e7e5f128..331163001963 100644 --- a/drivers/char/drm/drm_stub.c +++ b/drivers/char/drm/drm_stub.c | |||
@@ -60,6 +60,10 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, | |||
60 | int retcode; | 60 | int retcode; |
61 | 61 | ||
62 | INIT_LIST_HEAD(&dev->filelist); | 62 | INIT_LIST_HEAD(&dev->filelist); |
63 | INIT_LIST_HEAD(&dev->ctxlist); | ||
64 | INIT_LIST_HEAD(&dev->vmalist); | ||
65 | INIT_LIST_HEAD(&dev->maplist); | ||
66 | |||
63 | spin_lock_init(&dev->count_lock); | 67 | spin_lock_init(&dev->count_lock); |
64 | spin_lock_init(&dev->drw_lock); | 68 | spin_lock_init(&dev->drw_lock); |
65 | spin_lock_init(&dev->tasklet_lock); | 69 | spin_lock_init(&dev->tasklet_lock); |
@@ -81,8 +85,6 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, | |||
81 | return -ENOMEM; | 85 | return -ENOMEM; |
82 | } | 86 | } |
83 | 87 | ||
84 | INIT_LIST_HEAD(&dev->maplist); | ||
85 | |||
86 | /* the DRM has 6 basic counters */ | 88 | /* the DRM has 6 basic counters */ |
87 | dev->counters = 6; | 89 | dev->counters = 6; |
88 | dev->types[0] = _DRM_STAT_LOCK; | 90 | dev->types[0] = _DRM_STAT_LOCK; |