diff mbox series

pinctrl: amd: Fix use of undeclared identifier 'pinctrl_amd_s2idle_dev_ops'

Message ID 20250409213521.2218692-1-superm1@kernel.org
State New
Headers show
Series pinctrl: amd: Fix use of undeclared identifier 'pinctrl_amd_s2idle_dev_ops' | expand

Commit Message

Mario Limonciello April 9, 2025, 9:35 p.m. UTC 
From: Mario Limonciello <mario.limonciello@amd.com>

`pinctrl_amd_s2idle_dev_ops` is hidden under both `CONFIG_ACPI` and
`CONFIG_PM_SLEEP` so the functions that use it need the same scope.

Adjust checks to look for both.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202504100420.88UPkUTU-lkp@intel.com/
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/pinctrl/pinctrl-amd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Mario Limonciello April 10, 2025, 8:28 p.m. UTC | #1 
On 4/10/2025 7:50 AM, Rafael J. Wysocki wrote:
> On Wed, Apr 9, 2025 at 11:35 PM Mario Limonciello <superm1@kernel.org> wrote:
>>
>> From: Mario Limonciello <mario.limonciello@amd.com>
>>
>> `pinctrl_amd_s2idle_dev_ops` is hidden under both `CONFIG_ACPI` and
>> `CONFIG_PM_SLEEP` so the functions that use it need the same scope.
> 
> Shouldn't this be CONFIG_SUSPEND given what's going on in acpi.h?

Really - I think we probably should change all of pinctrl-amd.c to use 
CONFIG_SUSPEND.

> 
> Also, there is one more report regarding pinctrl_dev being unused:
> 
> https://lore.kernel.org/linux-acpi/202504101106.hPCEcoHr-lkp@intel.com/T/#u
> 
> Any chance to address all of this in one patch?

Sure; I'll spin again and get something out to cover both cases soon.

> 
>> Adjust checks to look for both.
>>
>> Reported-by: kernel test robot <lkp@intel.com>
>> Closes: https://lore.kernel.org/oe-kbuild-all/202504100420.88UPkUTU-lkp@intel.com/
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>>   drivers/pinctrl/pinctrl-amd.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
>> index b6fafed79b289..472a5aed4cd05 100644
>> --- a/drivers/pinctrl/pinctrl-amd.c
>> +++ b/drivers/pinctrl/pinctrl-amd.c
>> @@ -1209,7 +1209,7 @@ static int amd_gpio_probe(struct platform_device *pdev)
>>
>>          platform_set_drvdata(pdev, gpio_dev);
>>          acpi_register_wakeup_handler(gpio_dev->irq, amd_gpio_check_wake, gpio_dev);
>> -#ifdef CONFIG_ACPI
>> +#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
>>          acpi_register_lps0_dev(&pinctrl_amd_s2idle_dev_ops);
>>   #endif
>>
>> @@ -1230,7 +1230,7 @@ static void amd_gpio_remove(struct platform_device *pdev)
>>
>>          gpiochip_remove(&gpio_dev->gc);
>>          acpi_unregister_wakeup_handler(amd_gpio_check_wake, gpio_dev);
>> -#ifdef CONFIG_ACPI
>> +#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
>>          acpi_unregister_lps0_dev(&pinctrl_amd_s2idle_dev_ops);
>>   #endif
>>   }
>> --
>> 2.43.0
>>
>>
diff mbox series

Patch

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index b6fafed79b289..472a5aed4cd05 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -1209,7 +1209,7 @@  static int amd_gpio_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, gpio_dev);
 	acpi_register_wakeup_handler(gpio_dev->irq, amd_gpio_check_wake, gpio_dev);
-#ifdef CONFIG_ACPI
+#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
 	acpi_register_lps0_dev(&pinctrl_amd_s2idle_dev_ops);
 #endif
 
@@ -1230,7 +1230,7 @@  static void amd_gpio_remove(struct platform_device *pdev)
 
 	gpiochip_remove(&gpio_dev->gc);
 	acpi_unregister_wakeup_handler(amd_gpio_check_wake, gpio_dev);
-#ifdef CONFIG_ACPI
+#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
 	acpi_unregister_lps0_dev(&pinctrl_amd_s2idle_dev_ops);
 #endif
 }