diff options
-rw-r--r-- | drivers/gpu/drm/drm_stub.c | 5 | ||||
-rw-r--r-- | include/drm/drmP.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index ed8a99576df3..a378af49ed2e 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c | |||
@@ -127,8 +127,6 @@ struct drm_master *drm_master_create(struct drm_minor *minor) | |||
127 | INIT_LIST_HEAD(&master->magicfree); | 127 | INIT_LIST_HEAD(&master->magicfree); |
128 | master->minor = minor; | 128 | master->minor = minor; |
129 | 129 | ||
130 | list_add_tail(&master->head, &minor->master_list); | ||
131 | |||
132 | return master; | 130 | return master; |
133 | } | 131 | } |
134 | 132 | ||
@@ -146,8 +144,6 @@ static void drm_master_destroy(struct kref *kref) | |||
146 | struct drm_device *dev = master->minor->dev; | 144 | struct drm_device *dev = master->minor->dev; |
147 | struct drm_map_list *r_list, *list_temp; | 145 | struct drm_map_list *r_list, *list_temp; |
148 | 146 | ||
149 | list_del(&master->head); | ||
150 | |||
151 | if (dev->driver->master_destroy) | 147 | if (dev->driver->master_destroy) |
152 | dev->driver->master_destroy(dev, master); | 148 | dev->driver->master_destroy(dev, master); |
153 | 149 | ||
@@ -273,7 +269,6 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type) | |||
273 | 269 | ||
274 | minor->type = type; | 270 | minor->type = type; |
275 | minor->dev = dev; | 271 | minor->dev = dev; |
276 | INIT_LIST_HEAD(&minor->master_list); | ||
277 | 272 | ||
278 | *drm_minor_get_slot(dev, type) = minor; | 273 | *drm_minor_get_slot(dev, type) = minor; |
279 | return 0; | 274 | return 0; |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 3d06f71bc691..3d594ca7fa62 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -689,7 +689,6 @@ struct drm_master { | |||
689 | 689 | ||
690 | struct kref refcount; /* refcount for this master */ | 690 | struct kref refcount; /* refcount for this master */ |
691 | 691 | ||
692 | struct list_head head; /**< each minor contains a list of masters */ | ||
693 | struct drm_minor *minor; /**< link back to minor we are a master for */ | 692 | struct drm_minor *minor; /**< link back to minor we are a master for */ |
694 | 693 | ||
695 | char *unique; /**< Unique identifier: e.g., busid */ | 694 | char *unique; /**< Unique identifier: e.g., busid */ |
@@ -1022,7 +1021,6 @@ struct drm_minor { | |||
1022 | struct mutex debugfs_lock; /* Protects debugfs_list. */ | 1021 | struct mutex debugfs_lock; /* Protects debugfs_list. */ |
1023 | 1022 | ||
1024 | struct drm_master *master; /* currently active master for this node */ | 1023 | struct drm_master *master; /* currently active master for this node */ |
1025 | struct list_head master_list; | ||
1026 | struct drm_mode_group mode_group; | 1024 | struct drm_mode_group mode_group; |
1027 | }; | 1025 | }; |
1028 | 1026 | ||