[PATCH] ACPI: x86: s2idle: Revmoe unused variable hid

[Limonciello, Mario]

[Public]



> -----Original Message-----
> From: Hung, Alex <Alex.Hung at amd.com>
> Sent: Wednesday, October 26, 2022 12:34
> To: amd-gfx at lists.freedesktop.org; Deucher, Alexander
> <Alexander.Deucher at amd.com>; Limonciello, Mario
> <Mario.Limonciello at amd.com>
> Cc: Siqueira, Rodrigo <Rodrigo.Siqueira at amd.com>; Hung, Alex
> <Alex.Hung at amd.com>
> Subject: [PATCH] ACPI: x86: s2idle: Revmoe unused variable hid
                                                                    ^ 
Typo here

> This unused variable can cause build failures with allmodconfig, and
> therefore it should be removed.
> 
> Note: this does not applied to mainline (included in 100a57379380) but
> to amd-staging-drm-next only.
> 
> Fixes: 6648f8587530 ("ACPI: x86: s2idle: Move _HID handling for AMD
> systems into structures")
> Signed-off-by: Alex Hung <alex.hung at amd.com>

For the purpose of amd-staging-drm-next, should we perhaps revert the
commit and sync back to cherry-picks that landed from upstream?

The reason for these commits to be backported in the first place was for
s2idle testing on amd-staging-drm-next, they're dependencies for some
of the newer programs.

> ---
>  drivers/acpi/x86/s2idle.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
> index bfe611dc08cc..3d0cf0ace4a9 100644
> --- a/drivers/acpi/x86/s2idle.c
> +++ b/drivers/acpi/x86/s2idle.c
> @@ -475,7 +475,6 @@ static int lps0_device_attach(struct acpi_device
> *adev,
> 
> ACPI_LPS0_DSM_UUID_MICROSOFT, 0,
> 
> &lps0_dsm_guid_microsoft);
>  	if (acpi_s2idle_vendor_amd()) {
> -		const char *hid = acpi_device_hid(adev);
>  		static const struct acpi_device_id *dev_id;
>  		const struct amd_lps0_hid_device_data *data;
> 
> --
> 2.38.1