From: Lijo Lazar Date: Wed, 24 Mar 2021 04:56:28 +0000 (+0800) Subject: drm/amdgpu: Fix build warnings X-Git-Tag: v5.13-rc1~123^2~3^2~106 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=928a0fe6889ebc1cc0288b516d4604810ff1e2e7;p=thirdparty%2Flinux.git drm/amdgpu: Fix build warnings Fix header guard and make internal functions static. Fixes the below warnings: drivers/gpu/drm/amd/amdgpu/../amdgpu/amdgpu_reset.h:24:9: warning: '__AMDUGPU_RESET_H__' is used as a header guard here, followed by #define of a different macro [-Wheader-guard] drivers/gpu/drm/amd/amdgpu/aldebaran.c:110:6: warning: no previous prototype for function 'aldebaran_async_reset' [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/aldebaran_ppt.c:1435:5: warning: no previous prototype for function 'aldebaran_mode2_reset' [-Wmissing-prototypes] Signed-off-by: Lijo Lazar Reported-by: kernel test robot Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c b/drivers/gpu/drm/amd/amdgpu/aldebaran.c index 39604a461bf5f..65b1dca4b02e0 100644 --- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c +++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c @@ -107,7 +107,7 @@ aldebaran_mode2_prepare_hwcontext(struct amdgpu_reset_control *reset_ctl, return r; } -void aldebaran_async_reset(struct work_struct *work) +static void aldebaran_async_reset(struct work_struct *work) { struct amdgpu_reset_handler *handler; struct amdgpu_reset_control *reset_ctl = diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h index dc84d871fe728..e00d38d9160a4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h @@ -21,7 +21,7 @@ * */ -#ifndef __AMDUGPU_RESET_H__ +#ifndef __AMDGPU_RESET_H__ #define __AMDGPU_RESET_H__ #include "amdgpu.h" diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c index 472829f5ff1b5..ddbb9a23a0aff 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c @@ -1433,7 +1433,7 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, return sizeof(struct gpu_metrics_v1_1); } -int aldebaran_mode2_reset(struct smu_context *smu) +static int aldebaran_mode2_reset(struct smu_context *smu) { u32 smu_version; int ret = 0, index;