From 75b0920e9d39e41592f5b64072bba46b3ad37c9e Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Date: Fri, 11 Dec 2020 13:36:28 +0100
Subject: [PATCH] Revert "manager: split modem_suspend() into _pre() and
 _post() functions"

This reverts commit ff9b26b8315709b99f97b33e3119394190b2e7ed.
---
 src/manager.c  | 8 +-------
 src/manager.h  | 3 +--
 src/mm-iface.c | 3 ---
 src/suspend.c  | 4 +++-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/manager.c b/src/manager.c
index 78bf98b..2b466e3 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -135,20 +135,14 @@ error:
     manager->modem_state = EG25_STATE_RESETTING;
 }
 
-void modem_suspend_pre(struct EG25Manager *manager)
+void modem_suspend(struct EG25Manager *manager)
 {
-    manager->modem_state = EG25_STATE_SUSPENDING;
     gpio_sequence_suspend(manager);
-}
-
-void modem_suspend_post(struct EG25Manager *manager)
-{
     at_sequence_suspend(manager);
 }
 
 void modem_resume_pre(struct EG25Manager *manager)
 {
-    manager->modem_state = EG25_STATE_RESUMING;
     gpio_sequence_resume(manager);
 }
 
diff --git a/src/manager.h b/src/manager.h
index be92a09..714a812 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -51,8 +51,7 @@ struct EG25Manager {
 
 void modem_configure(struct EG25Manager *data);
 void modem_reset(struct EG25Manager *data);
-void modem_suspend_pre(struct EG25Manager *data);
-void modem_suspend_post(struct EG25Manager *data);
+void modem_suspend(struct EG25Manager *data);
 void modem_resume_pre(struct EG25Manager *data);
 void modem_resume_post(struct EG25Manager *data);
 void modem_update_state(struct EG25Manager *data, MMModemState state);
diff --git a/src/mm-iface.c b/src/mm-iface.c
index 9bf9209..f1021de 100644
--- a/src/mm-iface.c
+++ b/src/mm-iface.c
@@ -132,9 +132,6 @@ static void object_removed_cb(struct EG25Manager *manager, GDBusObject *object)
     path = g_dbus_object_get_object_path(object);
     g_message("ModemManager object `%s' removed", path);
 
-    if (manager->modem_state == EG25_STATE_SUSPENDING)
-        modem_suspend_post(manager);
-
     manager->mm_modem = NULL;
     if (manager->modem_usb_id) {
         g_free(manager->modem_usb_id);
diff --git a/src/suspend.c b/src/suspend.c
index 42a18f7..8296696 100644
--- a/src/suspend.c
+++ b/src/suspend.c
@@ -92,11 +92,13 @@ static void signal_cb(GDBusProxy *proxy,
 
     if (is_about_to_suspend) {
         g_message("system is about to suspend");
-        modem_suspend_pre(manager);
+        manager->modem_state = EG25_STATE_SUSPENDING;
+        modem_suspend(manager);
     } else {
         g_message("system is resuming");
         take_inhibitor(manager);
         modem_resume_pre(manager);
+        manager->modem_state = EG25_STATE_RESUMING;
         manager->suspend_source = g_timeout_add_seconds(8, G_SOURCE_FUNC(check_modem_resume), manager);
     }
 }