aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/drm_proc.c')
-rw-r--r--drivers/gpu/drm/drm_proc.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
index a9ba6b69ad35..9e5b07efebb7 100644
--- a/drivers/gpu/drm/drm_proc.c
+++ b/drivers/gpu/drm/drm_proc.c
@@ -55,7 +55,6 @@ static struct drm_info_list drm_proc_list[] = {
55 {"queues", drm_queues_info, 0}, 55 {"queues", drm_queues_info, 0},
56 {"bufs", drm_bufs_info, 0}, 56 {"bufs", drm_bufs_info, 0},
57 {"gem_names", drm_gem_name_info, DRIVER_GEM}, 57 {"gem_names", drm_gem_name_info, DRIVER_GEM},
58 {"gem_objects", drm_gem_object_info, DRIVER_GEM},
59#if DRM_DEBUG_CODE 58#if DRM_DEBUG_CODE
60 {"vma", drm_vma_info, 0}, 59 {"vma", drm_vma_info, 0},
61#endif 60#endif
@@ -151,7 +150,6 @@ fail:
151int drm_proc_init(struct drm_minor *minor, int minor_id, 150int drm_proc_init(struct drm_minor *minor, int minor_id,
152 struct proc_dir_entry *root) 151 struct proc_dir_entry *root)
153{ 152{
154 struct drm_device *dev = minor->dev;
155 char name[64]; 153 char name[64];
156 int ret; 154 int ret;
157 155
@@ -172,14 +170,6 @@ int drm_proc_init(struct drm_minor *minor, int minor_id,
172 return ret; 170 return ret;
173 } 171 }
174 172
175 if (dev->driver->proc_init) {
176 ret = dev->driver->proc_init(minor);
177 if (ret) {
178 DRM_ERROR("DRM: Driver failed to initialize "
179 "/proc/dri.\n");
180 return ret;
181 }
182 }
183 return 0; 173 return 0;
184} 174}
185 175
@@ -216,15 +206,11 @@ int drm_proc_remove_files(struct drm_info_list *files, int count,
216 */ 206 */
217int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) 207int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root)
218{ 208{
219 struct drm_device *dev = minor->dev;
220 char name[64]; 209 char name[64];
221 210
222 if (!root || !minor->proc_root) 211 if (!root || !minor->proc_root)
223 return 0; 212 return 0;
224 213
225 if (dev->driver->proc_cleanup)
226 dev->driver->proc_cleanup(minor);
227
228 drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor); 214 drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor);
229 215
230 sprintf(name, "%d", minor->index); 216 sprintf(name, "%d", minor->index);