diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-07-11 12:05:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 12:05:36 +1000 |
| 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 e82e78fa42b..d4b4dce68ad 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) drm_ht_create(&dev->magiclist, DRM_MAGIC_HASH_ORDER); INIT_LIST_HEAD(&dev->magicfree); - INIT_LIST_HEAD(&dev->ctxlist); - INIT_LIST_HEAD(&dev->vmalist); - dev->sigdata.lock = NULL; init_waitqueue_head(&dev->lock.lock_queue); dev->queue_count = 0; diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 59a9e7e5f12..33116300196 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, int retcode; INIT_LIST_HEAD(&dev->filelist); + INIT_LIST_HEAD(&dev->ctxlist); + INIT_LIST_HEAD(&dev->vmalist); + INIT_LIST_HEAD(&dev->maplist); + spin_lock_init(&dev->count_lock); spin_lock_init(&dev->drw_lock); spin_lock_init(&dev->tasklet_lock); @@ -81,8 +85,6 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, return -ENOMEM; } - INIT_LIST_HEAD(&dev->maplist); - /* the DRM has 6 basic counters */ dev->counters = 6; dev->types[0] = _DRM_STAT_LOCK; |