diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 22:53:26 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-30 09:38:08 +1000 |
| commit | be72ae26b11478c00c64858c86b647b438791671 (patch) | |
| tree | d4490daab3f4c193e7e4768f083c13ca77ac98eb | |
| parent | 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f (diff) | |
| download | op-kernel-dev-be72ae26b11478c00c64858c86b647b438791671.zip op-kernel-dev-be72ae26b11478c00c64858c86b647b438791671.tar.gz | |
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 a9ba6b6..e571de5 100644 --- a/drivers/gpu/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c @@ -151,7 +151,6 @@ fail: int drm_proc_init(struct drm_minor *minor, int minor_id, struct proc_dir_entry *root) { - struct drm_device *dev = minor->dev; char name[64]; int ret; @@ -172,14 +171,6 @@ int drm_proc_init(struct drm_minor *minor, int minor_id, return ret; } - if (dev->driver->proc_init) { - ret = dev->driver->proc_init(minor); - if (ret) { - DRM_ERROR("DRM: Driver failed to initialize " - "/proc/dri.\n"); - return ret; - } - } return 0; } @@ -216,15 +207,11 @@ int drm_proc_remove_files(struct drm_info_list *files, int count, */ int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root) { - struct drm_device *dev = minor->dev; char name[64]; if (!root || !minor->proc_root) return 0; - if (dev->driver->proc_cleanup) - dev->driver->proc_cleanup(minor); - drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor); sprintf(name, "%d", minor->index); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 15ea8c4..0d7af3f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -792,8 +792,6 @@ struct drm_driver { void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv, bool from_release); - int (*proc_init)(struct drm_minor *minor); - void (*proc_cleanup)(struct drm_minor *minor); int (*debugfs_init)(struct drm_minor *minor); void (*debugfs_cleanup)(struct drm_minor *minor); |
