diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 16:53:26 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-29 19:38:08 -0400 |
commit | be72ae26b11478c00c64858c86b647b438791671 (patch) | |
tree | d4490daab3f4c193e7e4768f083c13ca77ac98eb | |
parent | 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f (diff) |
drm: kill procfs callbacks
Not used by any driver (rightly so!). Kill them.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/drm_proc.c | 13 | ||||
-rw-r--r-- | include/drm/drmP.h | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c index a9ba6b69ad35..e571de536dc5 100644 --- a/drivers/gpu/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c | |||
@@ -151,7 +151,6 @@ fail: | |||
151 | int drm_proc_init(struct drm_minor *minor, int minor_id, | 151 | int drm_proc_init(struct drm_minor *minor, int minor_id, |
152 | struct proc_dir_entry *root) | 152 | struct proc_dir_entry *root) |
153 | { | 153 | { |
154 | struct drm_device *dev = minor->dev; | ||
155 | char name[64]; | 154 | char name[64]; |
156 | int ret; | 155 | int ret; |
157 | 156 | ||
@@ -172,14 +171,6 @@ int drm_proc_init(struct drm_minor *minor, int minor_id, | |||
172 | return ret; | 171 | return ret; |
173 | } | 172 | } |
174 | 173 | ||
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; | 174 | return 0; |
184 | } | 175 | } |
185 | 176 | ||
@@ -216,15 +207,11 @@ int drm_proc_remove_files(struct drm_info_list *files, int count, | |||
216 | */ | 207 | */ |
217 | int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) | 208 | int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) |
218 | { | 209 | { |
219 | struct drm_device *dev = minor->dev; | ||
220 | char name[64]; | 210 | char name[64]; |
221 | 211 | ||
222 | if (!root || !minor->proc_root) | 212 | if (!root || !minor->proc_root) |
223 | return 0; | 213 | return 0; |
224 | 214 | ||
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); | 215 | drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor); |
229 | 216 | ||
230 | sprintf(name, "%d", minor->index); | 217 | sprintf(name, "%d", minor->index); |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 15ea8c44f28d..0d7af3f39652 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -792,8 +792,6 @@ struct drm_driver { | |||
792 | void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv, | 792 | void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv, |
793 | bool from_release); | 793 | bool from_release); |
794 | 794 | ||
795 | int (*proc_init)(struct drm_minor *minor); | ||
796 | void (*proc_cleanup)(struct drm_minor *minor); | ||
797 | int (*debugfs_init)(struct drm_minor *minor); | 795 | int (*debugfs_init)(struct drm_minor *minor); |
798 | void (*debugfs_cleanup)(struct drm_minor *minor); | 796 | void (*debugfs_cleanup)(struct drm_minor *minor); |
799 | 797 | ||