From: Paul Cercueil <paul@crapouillou.net>
To: Ulf Hansson <ulf.hansson@linaro.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>
Cc: od@zcrc.me, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH v2 3/3] mmc: jz4740: Use pm_ptr() macro
Date: Mon, 13 Apr 2020 14:32:07 +0200 [thread overview]
Message-ID: <20200413123207.74552-3-paul@crapouillou.net> (raw)
In-Reply-To: <20200413123207.74552-1-paul@crapouillou.net>
Use the newly introduced pm_ptr() macro to simplify the code.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
Notes:
v2: Use pm_ptr() macro instead of pm_sleep_ptr()
drivers/mmc/host/jz4740_mmc.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index fbae87d1f017..2d41e7e5ec43 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -1099,24 +1099,18 @@ static int jz4740_mmc_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM_SLEEP
-
-static int jz4740_mmc_suspend(struct device *dev)
+static int __maybe_unused jz4740_mmc_suspend(struct device *dev)
{
return pinctrl_pm_select_sleep_state(dev);
}
-static int jz4740_mmc_resume(struct device *dev)
+static int __maybe_unused jz4740_mmc_resume(struct device *dev)
{
return pinctrl_select_default_state(dev);
}
static SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
jz4740_mmc_resume);
-#define JZ4740_MMC_PM_OPS (&jz4740_mmc_pm_ops)
-#else
-#define JZ4740_MMC_PM_OPS NULL
-#endif
static struct platform_driver jz4740_mmc_driver = {
.probe = jz4740_mmc_probe,
@@ -1124,7 +1118,7 @@ static struct platform_driver jz4740_mmc_driver = {
.driver = {
.name = "jz4740-mmc",
.of_match_table = of_match_ptr(jz4740_mmc_of_match),
- .pm = JZ4740_MMC_PM_OPS,
+ .pm = pm_ptr(&jz4740_mmc_pm_ops),
},
};
--
2.25.1
next prev parent reply other threads:[~2020-04-13 12:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 12:32 [PATCH v2 1/3] PM: introduce " Paul Cercueil
2020-04-13 12:32 ` [PATCH v2 2/3] PM: Make *_DEV_PM_OPS macros use __maybe_unused Paul Cercueil
2020-04-13 12:32 ` Paul Cercueil [this message]
2020-04-21 10:39 ` [PATCH v2 3/3] mmc: jz4740: Use pm_ptr() macro Ulf Hansson
2020-04-26 15:40 ` [PATCH v2 1/3] PM: introduce " Rafael J. Wysocki
2020-04-26 17:06 ` Paul Cercueil
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=20200413123207.74552-3-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=od@zcrc.me \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--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
all inboxes | Powered by JetHome®