lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm: kill procfs callbacks

Browse Source 
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>
This commit is contained in:
Daniel Vetter
2010-08-23 22:53:26 +02:00
committed by Dave Airlie
parent 1da3f87ebb
commit be72ae26b1
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/drm_proc.c
View File

@@ -151,7 +151,6 @@ fail:
int drm_proc_init(struct drm_minor *minor, int minor_id, int drm_proc_init(struct drm_minor *minor, int minor_id,
struct proc_dir_entry *root) struct proc_dir_entry *root)
{ {
struct drm_device *dev = minor->dev;
char name[64]; char name[64];
int ret; int ret;
@@ -172,14 +171,6 @@ int drm_proc_init(struct drm_minor *minor, int minor_id,
return ret; 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; 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) int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root)
{ {
struct drm_device *dev = minor->dev;
char name[64]; char name[64];
if (!root || !minor->proc_root) if (!root || !minor->proc_root)
return 0; return 0;
if (dev->driver->proc_cleanup)
dev->driver->proc_cleanup(minor);
drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor); drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor);
sprintf(name, "%d", minor->index); sprintf(name, "%d", minor->index);

2
include/drm/drmP.h
View File

@@ -792,8 +792,6 @@ struct drm_driver {
void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv, void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv,
bool from_release); bool from_release);
int (*proc_init)(struct drm_minor *minor);
void (*proc_cleanup)(struct drm_minor *minor);
int (*debugfs_init)(struct drm_minor *minor); int (*debugfs_init)(struct drm_minor *minor);
void (*debugfs_cleanup)(struct drm_minor *minor); void (*debugfs_cleanup)(struct drm_minor *minor);