Commit cedf7884 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alex Deucher
Browse files

drm/amdgpu: fix debugfs creation/removal, again 



There is still a warning when CONFIG_DEBUG_FS is disabled:

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1145:13: error: 'amdgpu_ras_debugfs_create_ctrl_node' defined but not used [-Werror=unused-function]
 1145 | static void amdgpu_ras_debugfs_create_ctrl_node(struct amdgpu_device *adev)

Change the code again to make the compiler actually drop
this code but not warn about it.

Fixes: ae2bf61f ("drm/amdgpu: guard ras debugfs creation/removal based on CONFIG_DEBUG_FS")
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d58159de

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+5 −8
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ static void amdgpu_ras_debugfs_create_ctrl_node(struct amdgpu_device *adev) 
			con->dir, &con->disable_ras_err_cnt_harvest);

}



void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,

static void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,

		struct ras_fs_if *head)

{

	struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
@@ -1189,7 +1189,6 @@ void amdgpu_ras_debugfs_create(struct amdgpu_device *adev, 


void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev)

{

#if defined(CONFIG_DEBUG_FS)

	struct amdgpu_ras *con = amdgpu_ras_get_context(adev);

	struct ras_manager *obj;

	struct ras_fs_if fs_info;
@@ -1198,7 +1197,7 @@ void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev) 
	 * it won't be called in resume path, no need to check

	 * suspend and gpu reset status

	 */

	if (!con)

	if (!IS_ENABLED(CONFIG_DEBUG_FS) || !con)

		return;



	amdgpu_ras_debugfs_create_ctrl_node(adev);
@@ -1212,10 +1211,9 @@ void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev) 
			amdgpu_ras_debugfs_create(adev, &fs_info);

		}

	}

#endif

}



void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,

static void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,

		struct ras_common_if *head)

{

	struct ras_manager *obj = amdgpu_ras_find_obj(adev, head);
@@ -1229,7 +1227,6 @@ void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev, 


static void amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev)

{

#if defined(CONFIG_DEBUG_FS)

	struct amdgpu_ras *con = amdgpu_ras_get_context(adev);

	struct ras_manager *obj, *tmp;
@@ -1238,7 +1235,6 @@ static void amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev) 
	}



	con->dir = NULL;

#endif

}

/* debugfs end */
@@ -1286,6 +1282,7 @@ static int amdgpu_ras_fs_init(struct amdgpu_device *adev) 


static int amdgpu_ras_fs_fini(struct amdgpu_device *adev)

{

	if (IS_ENABLED(CONFIG_DEBUG_FS))

		amdgpu_ras_debugfs_remove_all(adev);

	amdgpu_ras_sysfs_remove_all(adev);

	return 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h

+0 −6
Original line number Diff line number Diff line
@@ -592,14 +592,8 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev, 
int amdgpu_ras_sysfs_remove(struct amdgpu_device *adev,

		struct ras_common_if *head);



void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,

		struct ras_fs_if *head);



void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev);



void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,

		struct ras_common_if *head);



int amdgpu_ras_error_query(struct amdgpu_device *adev,

		struct ras_query_if *info);