[PATCH v3 2/4] alarmtimer: Use wakeup source from alarmtimer platform device

From: Stephen Boyd
Date: Fri Jan 24 2020 - 00:58:59 EST


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@xxxxxxxxxxxx>
Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
---
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