quectel: minor code reordering

3 files changed, 40 insertions, 36 deletions

diff --git a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
index a1342e64..4b4e0c96 100644
--- a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
@@ -16,6 +16,7 @@
 #include <config.h>
 
 #include "mm-broadband-modem-qmi-quectel.h"
+#include "mm-iface-modem.h"
 #include "mm-iface-modem-firmware.h"
 #include "mm-iface-modem-location.h"
 #include "mm-iface-modem-time.h"
@@ -78,18 +79,6 @@ iface_modem_init (MMIfaceModem *iface)
     iface->cleanup_sim_hot_swap = mm_shared_quectel_cleanup_sim_hot_swap;
 }
 
-static MMIfaceModem *
-peek_parent_modem_interface (MMSharedQuectel *self)
-{
-    return iface_modem_parent;
-}
-
-static MMBroadbandModemClass *
-peek_parent_broadband_modem_class (MMSharedQuectel *self)
-{
-    return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_qmi_quectel_parent_class);
-}
-
 static void
 iface_modem_firmware_init (MMIfaceModemFirmware *iface)
 {
@@ -110,12 +99,6 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
     iface->disable_location_gathering_finish = mm_shared_quectel_disable_location_gathering_finish;
 }
 
-static MMIfaceModemLocation *
-peek_parent_modem_location_interface (MMSharedQuectel *self)
-{
-    return iface_modem_location_parent;
-}
-
 static void
 iface_modem_time_init (MMIfaceModemTime *iface)
 {
@@ -123,6 +106,24 @@ iface_modem_time_init (MMIfaceModemTime *iface)
     iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
 }
 
+static MMBroadbandModemClass *
+peek_parent_broadband_modem_class (MMSharedQuectel *self)
+{
+    return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_qmi_quectel_parent_class);
+}
+
+static MMIfaceModem *
+peek_parent_modem_interface (MMSharedQuectel *self)
+{
+    return iface_modem_parent;
+}
+
+static MMIfaceModemLocation *
+peek_parent_modem_location_interface (MMSharedQuectel *self)
+{
+    return iface_modem_location_parent;
+}
+
 static void
 shared_quectel_init (MMSharedQuectel *iface)
 {
diff --git a/src/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c
index a66ff10b..a14bd100 100644
--- a/src/plugins/quectel/mm-broadband-modem-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.c
@@ -16,6 +16,7 @@
 #include <config.h>
 
 #include "mm-broadband-modem-quectel.h"
+#include "mm-iface-modem.h"
 #include "mm-iface-modem-firmware.h"
 #include "mm-iface-modem-location.h"
 #include "mm-iface-modem-time.h"
@@ -76,18 +77,6 @@ iface_modem_init (MMIfaceModem *iface)
     iface->cleanup_sim_hot_swap = mm_shared_quectel_cleanup_sim_hot_swap;
 }
 
-static MMIfaceModem *
-peek_parent_modem_interface (MMSharedQuectel *self)
-{
-    return iface_modem_parent;
-}
-
-static MMBroadbandModemClass *
-peek_parent_broadband_modem_class (MMSharedQuectel *self)
-{
-    return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_quectel_parent_class);
-}
-
 static void
 iface_modem_firmware_init (MMIfaceModemFirmware *iface)
 {
@@ -108,12 +97,6 @@ iface_modem_location_init (MMIfaceModemLocation *iface)
     iface->disable_location_gathering_finish = mm_shared_quectel_disable_location_gathering_finish;
 }
 
-static MMIfaceModemLocation *
-peek_parent_modem_location_interface (MMSharedQuectel *self)
-{
-    return iface_modem_location_parent;
-}
-
 static void
 iface_modem_time_init (MMIfaceModemTime *iface)
 {
@@ -121,6 +104,24 @@ iface_modem_time_init (MMIfaceModemTime *iface)
     iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
 }
 
+static MMBroadbandModemClass *
+peek_parent_broadband_modem_class (MMSharedQuectel *self)
+{
+    return MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_quectel_parent_class);
+}
+
+static MMIfaceModem *
+peek_parent_modem_interface (MMSharedQuectel *self)
+{
+    return iface_modem_parent;
+}
+
+static MMIfaceModemLocation *
+peek_parent_modem_location_interface (MMSharedQuectel *self)
+{
+    return iface_modem_location_parent;
+}
+
 static void
 shared_quectel_init (MMSharedQuectel *iface)
 {
diff --git a/src/plugins/quectel/mm-shared-quectel.c b/src/plugins/quectel/mm-shared-quectel.c
index 296c17ea..03829933 100644
--- a/src/plugins/quectel/mm-shared-quectel.c
+++ b/src/plugins/quectel/mm-shared-quectel.c
@@ -132,6 +132,8 @@ mm_shared_quectel_setup_ports (MMBroadbandModem *self)
     MMPortSerialAt *ports[2];
     guint           i;
 
+    mm_obj_dbg (self, "setting up ports in quectel modem...");
+
     priv = get_private (MM_SHARED_QUECTEL (self));
     g_assert (priv->broadband_modem_class_parent);
     g_assert (priv->broadband_modem_class_parent->setup_ports);