Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56c101af authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

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



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: default avatarKarol Herbst <nouveau@karolherbst.de>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 1b7ab1a1

drivers/gpu/drm/nouveau/nouveau_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ nouveau_debugfs_create_file(struct drm_minor *minor, 
}



int

nouveau_debugfs_init(struct drm_minor *minor)

nouveau_drm_debugfs_init(struct drm_minor *minor)

{

	int i, ret;
@@ -99,7 +99,7 @@ nouveau_debugfs_init(struct drm_minor *minor) 
}



void

nouveau_debugfs_takedown(struct drm_minor *minor)

nouveau_drm_debugfs_cleanup(struct drm_minor *minor)

{

	int i;

drivers/gpu/drm/nouveau/nouveau_debugfs.h

+5 −4
Original line number Diff line number Diff line
@@ -4,16 +4,17 @@ 
#include <drm/drmP.h>



#if defined(CONFIG_DEBUG_FS)

extern int  nouveau_debugfs_init(struct drm_minor *);

extern void nouveau_debugfs_takedown(struct drm_minor *);

extern int  nouveau_drm_debugfs_init(struct drm_minor *);

extern void nouveau_drm_debugfs_cleanup(struct drm_minor *);

#else

static inline int

nouveau_debugfs_init(struct drm_minor *minor)

nouveau_drm_debugfs_init(struct drm_minor *minor)

{

       return 0;

}



static inline void nouveau_debugfs_takedown(struct drm_minor *minor)

static inline void

nouveau_drm_debugfs_cleanup(struct drm_minor *minor)

{

}

drivers/gpu/drm/nouveau/nouveau_drm.c

+2 −2
Original line number Diff line number Diff line
@@ -933,8 +933,8 @@ driver_stub = { 
	.lastclose = nouveau_vga_lastclose,



#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = nouveau_debugfs_init,

	.debugfs_cleanup = nouveau_debugfs_takedown,

	.debugfs_init = nouveau_drm_debugfs_init,

	.debugfs_cleanup = nouveau_drm_debugfs_cleanup,

#endif



	.get_vblank_counter = drm_vblank_no_hw_counter,