ACPI: x86: s2idle: Remove dead code in lps0_device_attach()

[PATCH] ACPI: x86: s2idle: Remove dead code in lps0_device_attach()

Posted by Gergo Koteles 1 month ago

The rev_id is always 0 for AMD since commit
e32d546483a2 ("ACPI: x86: Drop quirk for HP Elitebook"),
so this condition will never be true.

Remove the dead code.

Signed-off-by: Gergo Koteles <soyer@irl.hu>
---
 drivers/acpi/x86/s2idle.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
index 6d4d06236f61..a095b6f4401b 100644
--- a/drivers/acpi/x86/s2idle.c
+++ b/drivers/acpi/x86/s2idle.c
@@ -459,9 +459,6 @@ static int lps0_device_attach(struct acpi_device *adev,
 			lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;
 			acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",
 					  ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask);
-		} else if (lps0_dsm_func_mask_microsoft > 0 && rev_id) {
-			lps0_dsm_func_mask_microsoft = -EINVAL;
-			acpi_handle_debug(adev->handle, "_DSM Using AMD method\n");
 		}
 	} else {
 		rev_id = 1;
-- 
2.52.0

Re: [PATCH] ACPI: x86: s2idle: Remove dead code in lps0_device_attach()

Posted by Mario Limonciello 4 weeks, 1 day ago

On 1/8/26 6:16 PM, Gergo Koteles wrote:
> The rev_id is always 0 for AMD since commit
> e32d546483a2 ("ACPI: x86: Drop quirk for HP Elitebook"),
> so this condition will never be true.
> 
> Remove the dead code.
> 
> Signed-off-by: Gergo Koteles <soyer@irl.hu>

Makes sense, thanks!

Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>

> ---
>   drivers/acpi/x86/s2idle.c | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
> index 6d4d06236f61..a095b6f4401b 100644
> --- a/drivers/acpi/x86/s2idle.c
> +++ b/drivers/acpi/x86/s2idle.c
> @@ -459,9 +459,6 @@ static int lps0_device_attach(struct acpi_device *adev,
>   			lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;
>   			acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",
>   					  ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask);
> -		} else if (lps0_dsm_func_mask_microsoft > 0 && rev_id) {
> -			lps0_dsm_func_mask_microsoft = -EINVAL;
> -			acpi_handle_debug(adev->handle, "_DSM Using AMD method\n");
>   		}
>   	} else {
>   		rev_id = 1;

Re: [PATCH] ACPI: x86: s2idle: Remove dead code in lps0_device_attach()

Posted by Rafael J. Wysocki 2 weeks, 2 days ago

On Fri, Jan 9, 2026 at 5:19 PM Mario Limonciello <superm1@kernel.org> wrote:
>
> On 1/8/26 6:16 PM, Gergo Koteles wrote:
> > The rev_id is always 0 for AMD since commit
> > e32d546483a2 ("ACPI: x86: Drop quirk for HP Elitebook"),
> > so this condition will never be true.
> >
> > Remove the dead code.
> >
> > Signed-off-by: Gergo Koteles <soyer@irl.hu>
>
> Makes sense, thanks!
>
> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>

Applied as 6.20 material, thanks!

> > ---
> >   drivers/acpi/x86/s2idle.c | 3 ---
> >   1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
> > index 6d4d06236f61..a095b6f4401b 100644
> > --- a/drivers/acpi/x86/s2idle.c
> > +++ b/drivers/acpi/x86/s2idle.c
> > @@ -459,9 +459,6 @@ static int lps0_device_attach(struct acpi_device *adev,
> >                       lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;
> >                       acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",
> >                                         ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask);
> > -             } else if (lps0_dsm_func_mask_microsoft > 0 && rev_id) {
> > -                     lps0_dsm_func_mask_microsoft = -EINVAL;
> > -                     acpi_handle_debug(adev->handle, "_DSM Using AMD method\n");
> >               }
> >       } else {
> >               rev_id = 1;
>