Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d67117d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Tri Vo
Browse files

UPSTREAM: 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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
(cherry picked from commit 623217a0cc45a6c179303b3bbfdc594806a464cc)
Bug: 129087298
Signed-off-by: default avatarTri Vo <trong@google.com>
Change-Id: I419150dcdbfce0689d6d287f6440bcd6c9ad1243
parent fe466c3b

drivers/base/power/wakeup.c

+1 −17
Original line number Diff line number Diff line
@@ -107,22 +107,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.

 */
@@ -162,7 +146,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);

include/linux/pm_wakeup.h

+0 −9
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static inline void device_set_wakeup_path(struct device *dev) 
/* drivers/base/power/wakeup.c */

extern void wakeup_source_prepare(struct wakeup_source *ws, const char *name);

extern struct wakeup_source *wakeup_source_create(const char *name);

extern void wakeup_source_drop(struct wakeup_source *ws);

extern void wakeup_source_destroy(struct wakeup_source *ws);

extern void wakeup_source_add(struct wakeup_source *ws);

extern void wakeup_source_remove(struct wakeup_source *ws);
@@ -134,8 +133,6 @@ static inline struct wakeup_source *wakeup_source_create(const char *name) 
	return NULL;

}



static inline void wakeup_source_drop(struct wakeup_source *ws) {}



static inline void wakeup_source_destroy(struct wakeup_source *ws) {}



static inline void wakeup_source_add(struct wakeup_source *ws) {}
@@ -204,12 +201,6 @@ static inline void wakeup_source_init(struct wakeup_source *ws, 
	wakeup_source_add(ws);

}



static inline void wakeup_source_trash(struct wakeup_source *ws)

{

	wakeup_source_remove(ws);

	wakeup_source_drop(ws);

}



static inline void __pm_wakeup_event(struct wakeup_source *ws, unsigned int msec)

{

	return pm_wakeup_ws_event(ws, msec, false);