diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-05-04 16:05:12 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-05 09:40:50 +0200 |
| commit | acab18b5c3a7025640abc84ace5e94c76ebd3d10 (patch) | |
| tree | 7307d2b13c0fd0c7a061bdf6c48ae96da648a8ac | |
| parent | drm: fix a memleak on mutex failure path (diff) | |
| download | linux-acab18b5c3a7025640abc84ace5e94c76ebd3d10.tar.xz linux-acab18b5c3a7025640abc84ace5e94c76ebd3d10.zip | |
drm: drop unused 'magicfree' list
This list is write-only. It's never used for read-access, so no reason to
keep it around. Drop it!
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/drm_auth.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 1 | ||||
| -rw-r--r-- | include/drm/drmP.h | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index fc8e8aaa34fb..8a37524d0867 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -37,7 +37,6 @@ #include "drm_internal.h" struct drm_magic_entry { - struct list_head head; struct drm_hash_item hash_item; struct drm_file *priv; }; @@ -93,7 +92,6 @@ static int drm_add_magic(struct drm_master *master, struct drm_file *priv, entry->hash_item.key = (unsigned long)magic; mutex_lock(&dev->struct_mutex); drm_ht_insert_item(&master->magiclist, &entry->hash_item); - list_add_tail(&entry->head, &master->magicfree); mutex_unlock(&dev->struct_mutex); return 0; @@ -123,7 +121,6 @@ int drm_remove_magic(struct drm_master *master, drm_magic_t magic) } pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item); drm_ht_remove_item(&master->magiclist, hash); - list_del(&pt->head); mutex_unlock(&dev->struct_mutex); kfree(pt); diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 48f7359e2a6b..26ed9feb3cfd 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -109,7 +109,6 @@ struct drm_master *drm_master_create(struct drm_minor *minor) kfree(master); return NULL; } - INIT_LIST_HEAD(&master->magicfree); master->minor = minor; return master; diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 4c31a2cc5a33..e2b101b49112 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -356,7 +356,6 @@ struct drm_lock_data { * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex. * @unique_len: Length of unique field. Protected by drm_global_mutex. * @magiclist: Hash of used authentication tokens. Protected by struct_mutex. - * @magicfree: List of used authentication tokens. Protected by struct_mutex. * @lock: DRI lock information. * @driver_priv: Pointer to driver-private information. */ @@ -366,7 +365,6 @@ struct drm_master { char *unique; int unique_len; struct drm_open_hash magiclist; - struct list_head magicfree; struct drm_lock_data lock; void *driver_priv; }; |