summaryrefslogtreecommitdiff
path: root/src/core/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/timer.c')
-rw-r--r--src/core/timer.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/core/timer.c b/src/core/timer.c
index 79a7540553..940550194b 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -267,12 +267,7 @@ static void timer_set_state(Timer *t, TimerState state) {
static void timer_enter_waiting(Timer *t, bool initial);
-static int timer_enter_waiting_coldplug(Unit *u) {
- timer_enter_waiting(TIMER(u), false);
- return 0;
-}
-
-static int timer_coldplug(Unit *u, Hashmap *deferred_work) {
+static int timer_coldplug(Unit *u) {
Timer *t = TIMER(u);
assert(t);
@@ -280,10 +275,9 @@ static int timer_coldplug(Unit *u, Hashmap *deferred_work) {
if (t->deserialized_state != t->state) {
- if (t->deserialized_state == TIMER_WAITING) {
- hashmap_put(deferred_work, u, &timer_enter_waiting_coldplug);
- timer_set_state(t, TIMER_WAITING);
- } else
+ if (t->deserialized_state == TIMER_WAITING)
+ timer_enter_waiting(t, false);
+ else
timer_set_state(t, t->deserialized_state);
}