leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/debugfs: rename functions to indicate they are used inside drm

Browse Source 
We will need our own debugfs_init and cleanup functions, because
nouveau_drm isn't ready while the DRM ones are called by DRM.

Signed-off-by: Karol Herbst <nouveau@karolherbst.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Karol Herbst 2015-07-31 00:35:42 +02:00 committed by Ben Skeggs
parent 1b7ab1a1c3
commit 56c101af40
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/nouveau_debugfs.c
View File

@ -81,7 +81,7 @@ nouveau_debugfs_create_file(struct drm_minor *minor,
} }
int int
nouveau_debugfs_init(struct drm_minor *minor) nouveau_drm_debugfs_init(struct drm_minor *minor)
{ {
int i, ret; int i, ret;
@ -99,7 +99,7 @@ nouveau_debugfs_init(struct drm_minor *minor)
} }
void void
nouveau_debugfs_takedown(struct drm_minor *minor) nouveau_drm_debugfs_cleanup(struct drm_minor *minor)
{ {
int i; int i;

9
drivers/gpu/drm/nouveau/nouveau_debugfs.h
View File

@ -4,16 +4,17 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
extern int nouveau_debugfs_init(struct drm_minor *); extern int nouveau_drm_debugfs_init(struct drm_minor *);
extern void nouveau_debugfs_takedown(struct drm_minor *); extern void nouveau_drm_debugfs_cleanup(struct drm_minor *);
#else #else
static inline int static inline int
nouveau_debugfs_init(struct drm_minor *minor) nouveau_drm_debugfs_init(struct drm_minor *minor)
{ {
return 0; return 0;
} }
static inline void nouveau_debugfs_takedown(struct drm_minor *minor) static inline void
nouveau_drm_debugfs_cleanup(struct drm_minor *minor)
{ {
} }

4
drivers/gpu/drm/nouveau/nouveau_drm.c
View File

@ -933,8 +933,8 @@ driver_stub = {
.lastclose = nouveau_vga_lastclose, .lastclose = nouveau_vga_lastclose,
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
.debugfs_init = nouveau_debugfs_init, .debugfs_init = nouveau_drm_debugfs_init,
.debugfs_cleanup = nouveau_debugfs_takedown, .debugfs_cleanup = nouveau_drm_debugfs_cleanup,
#endif #endif
.get_vblank_counter = drm_vblank_no_hw_counter, .get_vblank_counter = drm_vblank_no_hw_counter,