diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-11 12:53:59 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-12 09:43:00 +0100 |
| commit | 623217a0cc45a6c179303b3bbfdc594806a464cc (patch) | |
| tree | 4ba5f68254786ac49d477573b3518a9a1939cd62 /drivers/base/power | |
| parent | 1fad17fb1bbcd73159c2b992668a6957ecc5af8a (diff) | |
| download | lwn-623217a0cc45a6c179303b3bbfdc594806a464cc.tar.gz lwn-623217a0cc45a6c179303b3bbfdc594806a464cc.zip | |
PM / wakeup: Drop wakeup_source_drop()
After commit d856f39ac1cc ("PM / wakeup: Rework wakeup source timer
cancellation") wakeup_source_drop() is a trivial wrapper around
__pm_relax() and it has no users except for wakeup_source_destroy()
and wakeup_source_trash() which also has no users, so drop it along
with the latter and make wakeup_source_destroy() call __pm_relax()
directly.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'drivers/base/power')
| -rw-r--r-- | drivers/base/power/wakeup.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index a25d2d82f44d..ecbe152d151f 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -106,22 +106,6 @@ struct wakeup_source *wakeup_source_create(const char *name) } EXPORT_SYMBOL_GPL(wakeup_source_create); -/** - * wakeup_source_drop - Prepare a struct wakeup_source object for destruction. - * @ws: Wakeup source to prepare for destruction. - * - * Callers must ensure that __pm_stay_awake() or __pm_wakeup_event() will never - * be run in parallel with this function for the same wakeup source object. - */ -void wakeup_source_drop(struct wakeup_source *ws) -{ - if (!ws) - return; - - __pm_relax(ws); -} -EXPORT_SYMBOL_GPL(wakeup_source_drop); - /* * Record wakeup_source statistics being deleted into a dummy wakeup_source. */ @@ -161,7 +145,7 @@ void wakeup_source_destroy(struct wakeup_source *ws) if (!ws) return; - wakeup_source_drop(ws); + __pm_relax(ws); wakeup_source_record(ws); kfree_const(ws->name); kfree(ws); |