Skip to contentSkip to conversation

ACPI: x86: s2idle: Revmoe unused variable hid

PATCH In review Alex Hung 2 participants 2 messages Oct 26, 2022 ACPI

lore
Share & tools
lore

Alex Hung

author
#0 lore raw

PATCH 1/1 ACPI: x86: s2idle: Revmoe unused variable hid

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")
---
 drivers/acpi/x86/s2idle.c | 1 -
 1 file changed, 1 deletion(-)
drivers/acpi/x86/s2idle.c +0 -1
index bfe611dc08cc..3d0cf0ace4a9 100644
@@ -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;
 
Signature · 1 line
2.38.1
#1 lore raw

[Public]

Quoted 9 lines

-----Original Message-----
From: Hung, Alex <[email protected]>
Sent: Wednesday, October 26, 2022 12:34
To: [email protected]; Deucher, Alexander <[email protected]>; Limonciello, Mario <[email protected]>
Cc: Siqueira, Rodrigo <[email protected]>; Hung, Alex <[email protected]>
Subject: [PATCH] ACPI: x86: s2idle: Revmoe unused variable hid

                                                                    ^ 

Typo here

Quoted 9 lines

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")

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.

Quoted 21 lines
---
 drivers/acpi/x86/s2idle.c | 1 -
 1 file changed, 1 deletion(-)
drivers/acpi/x86/s2idle.c +0 -1
index bfe611dc08cc..3d0cf0ace4a9 100644
@@ -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);
drivers/acpi/x86/s2idle.c +0 -1
 		static const struct acpi_device_id *dev_id;
 		const struct amd_lps0_hid_device_data *data;
 
--

2.38.1