| Message ID | 20230522115047.1169839-5-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] drm/amd/pm: mark irq functions as 'static' | expand |
Applied the series. Thanks! Alex On Mon, May 22, 2023 at 7:51 AM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > Two newly introduced functions are in the global namespace but have no prototypes > or callers outside of amdgpu_acpi.c, another function is static but only has > a caller inside of an #ifdef: > > drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:902:13: error: no previous prototype for 'amdgpu_acpi_get_node_id' [-Werror=missing-prototypes] > drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:928:30: error: no previous prototype for 'amdgpu_acpi_get_dev' [-Werror=missing-prototypes] > drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c:860:33: error: 'amdgpu_acpi_get_numa_info' defined but not used [-Werror=unused-function] > > Avoid the warnings by marking all of them static and ensuring that the compiler is > able to see the callsites. > > Fixes: c34db97b8217 ("drm/amdgpu: Add API to get numa information of XCC") > Fixes: 1f6f659d06e1 ("drm/amdgpu: Store additional numa node information") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > index 873532c4adbe..1dbcd0e62478 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > @@ -899,13 +899,15 @@ static struct amdgpu_numa_info *amdgpu_acpi_get_numa_info(uint32_t pxm) > * > * Returns ACPI STATUS OK with Node ID on success or the corresponding failure reason > */ > -acpi_status amdgpu_acpi_get_node_id(acpi_handle handle, > +static acpi_status amdgpu_acpi_get_node_id(acpi_handle handle, > struct amdgpu_numa_info **numa_info) > { > -#ifdef CONFIG_ACPI_NUMA > u64 pxm; > acpi_status status; > > + if (!IS_ENABLED(CONFIG_ACPI_NUMA)) > + return_ACPI_STATUS(AE_NOT_EXIST); > + > if (!numa_info) > return_ACPI_STATUS(AE_ERROR); > > @@ -920,12 +922,9 @@ acpi_status amdgpu_acpi_get_node_id(acpi_handle handle, > return_ACPI_STATUS(AE_ERROR); > > return_ACPI_STATUS(AE_OK); > -#else > - return_ACPI_STATUS(AE_NOT_EXIST); > -#endif > } > > -struct amdgpu_acpi_dev_info *amdgpu_acpi_get_dev(u16 bdf) > +static struct amdgpu_acpi_dev_info *amdgpu_acpi_get_dev(u16 bdf) > { > struct amdgpu_acpi_dev_info *acpi_dev; > > -- > 2.39.2 >
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c index 873532c4adbe..1dbcd0e62478 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c @@ -899,13 +899,15 @@ static struct amdgpu_numa_info *amdgpu_acpi_get_numa_info(uint32_t pxm) * * Returns ACPI STATUS OK with Node ID on success or the corresponding failure reason */ -acpi_status amdgpu_acpi_get_node_id(acpi_handle handle, +static acpi_status amdgpu_acpi_get_node_id(acpi_handle handle, struct amdgpu_numa_info **numa_info) { -#ifdef CONFIG_ACPI_NUMA u64 pxm; acpi_status status; + if (!IS_ENABLED(CONFIG_ACPI_NUMA)) + return_ACPI_STATUS(AE_NOT_EXIST); + if (!numa_info) return_ACPI_STATUS(AE_ERROR); @@ -920,12 +922,9 @@ acpi_status amdgpu_acpi_get_node_id(acpi_handle handle, return_ACPI_STATUS(AE_ERROR); return_ACPI_STATUS(AE_OK); -#else - return_ACPI_STATUS(AE_NOT_EXIST); -#endif } -struct amdgpu_acpi_dev_info *amdgpu_acpi_get_dev(u16 bdf) +static struct amdgpu_acpi_dev_info *amdgpu_acpi_get_dev(u16 bdf) { struct amdgpu_acpi_dev_info *acpi_dev;