1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c
index 80254547a3f8..7e4bae760e27 100644
--- a/drivers/gpu/drm/drm_hashtab.c
+++ b/drivers/gpu/drm/drm_hashtab.c
@@ -60,14 +60,13 @@ void drm_ht_verbose_list(struct drm_open_hash *ht, unsigned long key)
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list;
         unsigned int hashed_key;
         int count = 0;
 
         hashed_key = hash_long(key, ht->order);
         DRM_DEBUG("Key is 0x%08lx, Hashed key is 0x%08x\n", key, hashed_key);
         h_list = &ht->table[hashed_key];
-        hlist_for_each_entry(entry, list, h_list, head)
+        hlist_for_each_entry(entry, h_list, head)
                 DRM_DEBUG("count %d, key: 0x%08lx\n", count++, entry->key);
 }
 
@@ -76,14 +75,13 @@ static struct hlist_node *drm_ht_find_key(struct drm_open_hash *ht,
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list;
         unsigned int hashed_key;
 
         hashed_key = hash_long(key, ht->order);
         h_list = &ht->table[hashed_key];
-        hlist_for_each_entry(entry, list, h_list, head) {
+        hlist_for_each_entry(entry, h_list, head) {
                 if (entry->key == key)
-                        return list;
+                        return &entry->head;
                 if (entry->key > key)
                         break;
         }
@@ -95,14 +93,13 @@ static struct hlist_node *drm_ht_find_key_rcu(struct drm_open_hash *ht,
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list;
         unsigned int hashed_key;
 
         hashed_key = hash_long(key, ht->order);
         h_list = &ht->table[hashed_key];
-        hlist_for_each_entry_rcu(entry, list, h_list, head) {
+        hlist_for_each_entry_rcu(entry, h_list, head) {
                 if (entry->key == key)
-                        return list;
+                        return &entry->head;
                 if (entry->key > key)
                         break;
         }
@@ -113,19 +110,19 @@ int drm_ht_insert_item(struct drm_open_hash *ht, struct drm_hash_item *item)
 {
         struct drm_hash_item *entry;
         struct hlist_head *h_list;
-        struct hlist_node *list, *parent;
+        struct hlist_node *parent;
         unsigned int hashed_key;
         unsigned long key = item->key;
 
         hashed_key = hash_long(key, ht->order);
         h_list = &ht->table[hashed_key];
         parent = NULL;
-        hlist_for_each_entry(entry, list, h_list, head) {
+        hlist_for_each_entry(entry, h_list, head) {
                 if (entry->key == key)
                         return -EINVAL;
                 if (entry->key > key)
                         break;
-                parent = list;
+                parent = &entry->head;
         }
         if (parent) {
                 hlist_add_after_rcu(parent, &item->head);