From: Stephen Boyd <swboyd@chromium.org>
To: John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, Stephen Boyd <sboyd@kernel.org>,
Douglas Anderson <dianders@chromium.org>
Subject: [PATCH v3 2/4] alarmtimer: Use wakeup source from alarmtimer platform device
Date: Thu, 23 Jan 2020 21:58:47 -0800 [thread overview]
Message-ID: <20200124055849.154411-3-swboyd@chromium.org> (raw)
In-Reply-To: <20200124055849.154411-1-swboyd@chromium.org>
Use the wakeup source that can be associated with the 'alarmtimer'
platform device instead of registering another one by hand.
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
kernel/time/alarmtimer.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 205365906137..395d4a6db1b2 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -58,8 +58,6 @@ static DEFINE_SPINLOCK(freezer_delta_lock);
#endif
#ifdef CONFIG_RTC_CLASS
-static struct wakeup_source *ws;
-
/* rtc timer and device for setting alarm wakeups at suspend */
static struct rtc_timer rtctimer;
static struct rtc_device *rtcdev;
@@ -90,7 +88,6 @@ static int alarmtimer_rtc_add_device(struct device *dev,
{
unsigned long flags;
struct rtc_device *rtc = to_rtc_device(dev);
- struct wakeup_source *__ws;
struct platform_device *pdev;
int ret = 0;
@@ -102,12 +99,13 @@ static int alarmtimer_rtc_add_device(struct device *dev,
if (!device_may_wakeup(rtc->dev.parent))
return -1;
- __ws = wakeup_source_register(dev, "alarmtimer");
pdev = platform_device_register_data(dev, "alarmtimer",
PLATFORM_DEVID_AUTO, NULL, 0);
+ if (!IS_ERR(pdev))
+ device_init_wakeup(&pdev->dev, true);
spin_lock_irqsave(&rtcdev_lock, flags);
- if (__ws && !IS_ERR(pdev) && !rtcdev) {
+ if (!IS_ERR(pdev) && !rtcdev) {
if (!try_module_get(rtc->owner)) {
ret = -1;
goto unlock;
@@ -116,8 +114,6 @@ static int alarmtimer_rtc_add_device(struct device *dev,
rtcdev = rtc;
/* hold a reference so it doesn't go away */
get_device(dev);
- ws = __ws;
- __ws = NULL;
pdev = NULL;
} else {
ret = -1;
@@ -126,7 +122,6 @@ static int alarmtimer_rtc_add_device(struct device *dev,
spin_unlock_irqrestore(&rtcdev_lock, flags);
platform_device_unregister(pdev);
- wakeup_source_unregister(__ws);
return ret;
}
@@ -293,7 +288,7 @@ static int alarmtimer_suspend(struct device *dev)
return 0;
if (ktime_to_ns(min) < 2 * NSEC_PER_SEC) {
- __pm_wakeup_event(ws, 2 * MSEC_PER_SEC);
+ pm_wakeup_event(dev, 2 * MSEC_PER_SEC);
return -EBUSY;
}
@@ -308,7 +303,7 @@ static int alarmtimer_suspend(struct device *dev)
/* Set alarm, if in the past reject suspend briefly to handle */
ret = rtc_timer_start(rtc, &rtctimer, now, 0);
if (ret < 0)
- __pm_wakeup_event(ws, MSEC_PER_SEC);
+ pm_wakeup_event(dev, MSEC_PER_SEC);
return ret;
}
--
Sent by a computer, using git, on the internet
next prev parent reply other threads:[~2020-01-24 5:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 5:58 [PATCH v3 0/4] Fix alarmtimer suspend failure Stephen Boyd
2020-01-24 5:58 ` [PATCH v3 1/4] alarmtimer: Make alarmtimer platform device child of RTC device Stephen Boyd
2020-01-24 20:08 ` [tip: timers/core] " tip-bot2 for Stephen Boyd
2020-01-24 5:58 ` Stephen Boyd [this message]
2020-01-24 20:08 ` [tip: timers/core] alarmtimer: Use wakeup source from alarmtimer platform device tip-bot2 for Stephen Boyd
2020-01-24 5:58 ` [PATCH v3 3/4] alarmtimer: Make alarmtimer_get_rtcdev() a stub when CONFIG_RTC_CLASS=n Stephen Boyd
2020-01-24 20:08 ` [tip: timers/core] " tip-bot2 for Stephen Boyd
2020-01-24 5:58 ` [PATCH v3 4/4] alarmtimer: Update alarmtimer_get_rtcdev() docs to reflect reality Stephen Boyd
2020-01-24 20:08 ` [tip: timers/core] " tip-bot2 for Stephen Boyd
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=20200124055849.154411-3-swboyd@chromium.org \
--to=swboyd@chromium.org \
--cc=dianders@chromium.org \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@kernel.org \
--cc=tglx@linutronix.de \
/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).