From: Paul Cercueil <paul@crapouillou.net>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Arnd Bergmann <arnd@arndb.de>,
Jonathan Cameron <jic23@kernel.org>
Cc: list@opendingux.net, linux-mips@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, linux-pm@vger.kernel.org,
Paul Cercueil <paul@crapouillou.net>,
Heiner Kallweit <hkallweit1@gmail.com>,
nic_swsd@realtek.com, "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH 1/5] r8169: Avoid misuse of pm_ptr() macro
Date: Tue, 7 Dec 2021 00:20:58 +0000 [thread overview]
Message-ID: <20211207002102.26414-2-paul@crapouillou.net> (raw)
In-Reply-To: <20211207002102.26414-1-paul@crapouillou.net>
The pm_ptr() macro should be used when the suspend and resume functions
can be compiled independently of the CONFIG_PM Kconfig option.
In the case of this driver, the suspend and resume functions are inside
a section protected by a #ifdef CONFIG_PM guard. Therefore pm_ptr()
should not be used.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: <nic_swsd@realtek.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/ethernet/realtek/r8169_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 86c44bc5f73f..6b81f95698f0 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5441,7 +5441,9 @@ static struct pci_driver rtl8169_pci_driver = {
.probe = rtl_init_one,
.remove = rtl_remove_one,
.shutdown = rtl_shutdown,
- .driver.pm = pm_ptr(&rtl8169_pm_ops),
+#ifdef CONFIG_PM
+ .driver.pm = &rtl8169_pm_ops,
+#endif
};
module_pci_driver(rtl8169_pci_driver);
--
2.33.0
next prev parent reply other threads:[~2021-12-07 0:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 0:20 [PATCH 0/5] Rework pm_ptr() and *_PM_OPS macros Paul Cercueil
2021-12-07 0:20 ` Paul Cercueil [this message]
2021-12-07 0:20 ` [PATCH 2/5] PM: core: Redefine pm_ptr() macro Paul Cercueil
2021-12-16 11:10 ` Jonathan Cameron
2021-12-07 0:21 ` [PATCH 3/5] PM: core: Add new *_PM_OPS macros, deprecate old ones Paul Cercueil
2021-12-16 11:09 ` Jonathan Cameron
2021-12-07 0:21 ` [PATCH 4/5] mmc: jz4740: Use the new PM macros Paul Cercueil
2021-12-07 0:21 ` [PATCH 5/5] mmc: mxc: " Paul Cercueil
2021-12-07 9:22 ` [PATCH 0/5] Rework pm_ptr() and *_PM_OPS macros Arnd Bergmann
2021-12-17 15:07 ` Rafael J. Wysocki
2021-12-17 17:16 ` Ulf Hansson
2021-12-17 18:22 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211207002102.26414-2-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=hkallweit1@gmail.com \
--cc=jic23@kernel.org \
--cc=kuba@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=list@opendingux.net \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).