drm/amdgpu: fix building without DEBUG_FS
Subsystems (3)
PATCH 1/1 drm/amdgpu: fix building without DEBUG_FS
From: Arnd Bergmann <[email protected]>
The debugfs file is defined unconditionally, but the registration is hidden in an #ifdef, which causes a warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c:110:37: error: unused variable 'amdgpu_rap_debugfs_ops' [-Werror,-Wunused-const-variable]
static const struct file_operations amdgpu_rap_debugfs_ops = {
^in amdgpu_pm.c, the same thing happens with the clocks[] variable:
drivers/gpu/drm/amd/pm/amdgpu_pm.c:38:34: error: unused variable 'clocks' [-Werror,-Wunused-const-variable]
static const struct cg_flag_name clocks[] = {
^Since debugfs_create_file() does nothing when debugfs is disabled, removing the ifdefs makes the code more readable and also avoids both warnings.
Fixes a4322e1881bed ("drm/amdgpu: add debugfs interface for RAP test")
Fixes e098bc9612c2b ("drm/amd/pm: optimize the power related source code layout")
Reported-by kernel test robot <[email protected]>
Signed-off-by Arnd Bergmann <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 2 -- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 6 ------ 2 files changed, 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c +0 -2
@@ -116,7 +116,6 @@ static const struct file_operations amdgpu_rap_debugfs_ops = {void amdgpu_rap_debugfs_init (struct amdgpu_device *adev) { -#if defined(CONFIG_DEBUG_FS )struct drm_minor *minor =adev_to_drm (adev)->primary;if (!adev->psp.rap_context.context.initialized)
@@ -124,5 +123,4 @@ void amdgpu_rap_debugfs_init(struct amdgpu_device *adev)debugfs_create_file ("rap_test" ,S_IWUSR , minor->debugfs_root, adev, &amdgpu_rap_debugfs_ops); -#endif }
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0 -6
@@ -3565,8 +3565,6 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device *adev)/* * Debugfs info */ -#if defined(CONFIG_DEBUG_FS ) -static void amdgpu_debugfs_prints_cpu_info (struct seq_file *m,struct amdgpu_device *adev) {uint16_t *p_val;
@@ -3768,11 +3766,8 @@ static const struct file_operations amdgpu_debugfs_pm_prv_buffer_fops = { .llseek = default_llseek, }; -#endif -void amdgpu_debugfs_pm_init (struct amdgpu_device *adev) { -#if defined(CONFIG_DEBUG_FS )struct drm_minor *minor =adev_to_drm (adev)->primary;struct dentry *root = minor->debugfs_root;
@@ -3789,5 +3784,4 @@ void amdgpu_debugfs_pm_init(struct amdgpu_device *adev) adev->pm.smu_prv_buffer_size);amdgpu_dpm_stb_debug_fs_init (adev); -#endif }
Signature · 1 line
2.39.2