From 25bb6633baca9cc912b3a0473744c2eb9498649e Mon Sep 17 00:00:00 2001
From: Dan Williams <dan@ioncontrol.co>
Date: Sat, 8 Mar 2025 14:43:02 -0600
Subject: [PATCH] broadband-modem-qmi,mbim: remove redundant port closes
This will just be done immediately after by MMBaseModem's
dispose() handler.
Signed-off-by: Dan Williams <dan@ioncontrol.co>
---
src/mm-broadband-modem-mbim.c | 6 ------
src/mm-broadband-modem-qmi.c | 11 -----------
2 files changed, 17 deletions(-)
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index b9107a557..c895c15d4 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -10377,12 +10377,6 @@ dispose (GObject *object)
/* Explicitly remove notification handler */
self->priv->setup_flags = PROCESS_NOTIFICATION_FLAG_NONE;
common_setup_cleanup_unsolicited_events_sync (self, mbim, FALSE);
-
- /* If we did open the MBIM port during initialization, close it now */
- if (mm_port_mbim_is_open (mbim)) {
-g_message ("###### %s: [%p] mbim will close", __func__, mbim);
- mm_port_mbim_close (mbim, NULL, NULL);
- }
}
g_clear_object (&self->priv->unlock_retries);
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 7359fccbd..93b307b4a 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -13994,17 +13994,6 @@ static void
dispose (GObject *object)
{
MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (object);
- MMPortQmi *qmi;
-
- /* If any port cleanup is needed, it must be done during dispose(), as
- * the modem object will be affected by an explicit g_object_run_dispose()
- * that will remove all port references right away */
- qmi = mm_broadband_modem_qmi_peek_port_qmi (self);
- if (qmi) {
- /* If we did open the QMI port during initialization, close it now */
- if (mm_port_qmi_is_open (qmi))
- mm_port_qmi_close (qmi, NULL, NULL);
- }
g_list_free_full (self->priv->firmware_list, g_object_unref);
self->priv->firmware_list = NULL;
--
GitLab