* [PATCH] pcmcia: Guard yenta_dev_{resume,suspend}_noirq() on CONFIG_PM_SLEEP
@ 2022-01-11 16:50 Nathan Chancellor
2022-01-12 4:56 ` Dominik Brodowski
0 siblings, 1 reply; 2+ messages in thread
From: Nathan Chancellor @ 2022-01-11 16:50 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: Cai Huoqing, linux-kernel, Nathan Chancellor
When building without CONFIG_PM_SLEEP:
drivers/pcmcia/yenta_socket.c:1322:12: error: ‘yenta_dev_resume_noirq’ defined but not used [-Werror=unused-function]
1322 | static int yenta_dev_resume_noirq(struct device *dev)
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/pcmcia/yenta_socket.c:1303:12: error: ‘yenta_dev_suspend_noirq’ defined but not used [-Werror=unused-function]
1303 | static int yenta_dev_suspend_noirq(struct device *dev)
| ^~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS evaluates to an empty macro when
CONFIG_PM_SLEEP is not set. Every callback in yenta_pm_ops depends on
CONFIG_PM_SLEEP to work properly so just guard this whole block on
CONFIG_PM_SLEEP, rather than CONFIG_PM, which CONFIG_PM_SLEEP will
select.
Fixes: 3daaf2c7aae8 ("pcmcia: Make use of the helper macro SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
drivers/pcmcia/yenta_socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 837877daed62..3966a6ceb1ac 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1299,7 +1299,7 @@ static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
return ret;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int yenta_dev_suspend_noirq(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
base-commit: fbb3485f1f931102d8ba606f1c28123f5b48afa3
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pcmcia: Guard yenta_dev_{resume,suspend}_noirq() on CONFIG_PM_SLEEP
2022-01-11 16:50 [PATCH] pcmcia: Guard yenta_dev_{resume,suspend}_noirq() on CONFIG_PM_SLEEP Nathan Chancellor
@ 2022-01-12 4:56 ` Dominik Brodowski
0 siblings, 0 replies; 2+ messages in thread
From: Dominik Brodowski @ 2022-01-12 4:56 UTC (permalink / raw)
To: Nathan Chancellor; +Cc: Cai Huoqing, linux-kernel
Am Tue, Jan 11, 2022 at 09:50:04AM -0700 schrieb Nathan Chancellor:
> When building without CONFIG_PM_SLEEP:
>
> drivers/pcmcia/yenta_socket.c:1322:12: error: ‘yenta_dev_resume_noirq’ defined but not used [-Werror=unused-function]
> 1322 | static int yenta_dev_resume_noirq(struct device *dev)
> | ^~~~~~~~~~~~~~~~~~~~~~
> drivers/pcmcia/yenta_socket.c:1303:12: error: ‘yenta_dev_suspend_noirq’ defined but not used [-Werror=unused-function]
> 1303 | static int yenta_dev_suspend_noirq(struct device *dev)
> | ^~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
>
> SET_NOIRQ_SYSTEM_SLEEP_PM_OPS evaluates to an empty macro when
> CONFIG_PM_SLEEP is not set. Every callback in yenta_pm_ops depends on
> CONFIG_PM_SLEEP to work properly so just guard this whole block on
> CONFIG_PM_SLEEP, rather than CONFIG_PM, which CONFIG_PM_SLEEP will
> select.
>
> Fixes: 3daaf2c7aae8 ("pcmcia: Make use of the helper macro SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()")
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Thanks! An equivalent patch by Paul E. McKenney was hand-picked by Linus in
the meantime:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=579f3a6d32a9c3d1cf5c2b1bd66817a2db31a968
Thanks again,
Dominik
> ---
> drivers/pcmcia/yenta_socket.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
> index 837877daed62..3966a6ceb1ac 100644
> --- a/drivers/pcmcia/yenta_socket.c
> +++ b/drivers/pcmcia/yenta_socket.c
> @@ -1299,7 +1299,7 @@ static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
> return ret;
> }
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
> static int yenta_dev_suspend_noirq(struct device *dev)
> {
> struct pci_dev *pdev = to_pci_dev(dev);
>
> base-commit: fbb3485f1f931102d8ba606f1c28123f5b48afa3
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-12 5:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-11 16:50 [PATCH] pcmcia: Guard yenta_dev_{resume,suspend}_noirq() on CONFIG_PM_SLEEP Nathan Chancellor
2022-01-12 4:56 ` Dominik Brodowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).