aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Schrock <steve.schrock@getcruise.com>2024-04-23 14:59:34 +0000
committerDenis Kenzior <denkenz@gmail.com>2024-04-23 10:04:19 -0500
commitb9d3413bc9209ea83ebfb696672c905cb440c047 (patch)
treebbf44c74374486a065ef46968682f22ec2f20930
parent789f68a5fba332fe6d16102c63578eac46a1f0b3 (diff)
downloadofono-b9d3413bc9209ea83ebfb696672c905cb440c047.tar.gz
qmimodem: Remove redundant unregister all calls
Some of the qmimodem drivers were calling qmi_service_unregister_all before decrementing the reference count to 0. This is unnecessary because the service will unregister all as it is being destroyed.
-rw-r--r--drivers/qmimodem/gprs-context.c4
-rw-r--r--drivers/qmimodem/location-reporting.c2
-rw-r--r--drivers/qmimodem/sms.c2
-rw-r--r--drivers/qmimodem/voicecall.c2
4 files changed, 1 insertions, 9 deletions
diff --git a/drivers/qmimodem/gprs-context.c b/drivers/qmimodem/gprs-context.c
index 6104cc82e..d248761f9 100644
--- a/drivers/qmimodem/gprs-context.c
+++ b/drivers/qmimodem/gprs-context.c
@@ -503,10 +503,8 @@ static void qmi_gprs_context_remove(struct ofono_gprs_context *gc)
ofono_gprs_context_set_data(gc, NULL);
- if (data->wds) {
- qmi_service_unregister_all(data->wds);
+ if (data->wds)
qmi_service_unref(data->wds);
- }
l_free(data);
}
diff --git a/drivers/qmimodem/location-reporting.c b/drivers/qmimodem/location-reporting.c
index a32d18245..549bd5740 100644
--- a/drivers/qmimodem/location-reporting.c
+++ b/drivers/qmimodem/location-reporting.c
@@ -257,8 +257,6 @@ static void qmi_location_reporting_remove(struct ofono_location_reporting *lr)
ofono_location_reporting_set_data(lr, NULL);
- qmi_service_unregister_all(data->pds);
-
qmi_service_unref(data->pds);
l_free(data);
diff --git a/drivers/qmimodem/sms.c b/drivers/qmimodem/sms.c
index b9fe96352..12f5d6726 100644
--- a/drivers/qmimodem/sms.c
+++ b/drivers/qmimodem/sms.c
@@ -801,8 +801,6 @@ static void qmi_sms_remove(struct ofono_sms *sms)
ofono_sms_set_data(sms, NULL);
- qmi_service_unregister_all(data->wms);
-
qmi_service_unref(data->wms);
if (data->msg_list)
diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
index b66f1ae7d..02376c3df 100644
--- a/drivers/qmimodem/voicecall.c
+++ b/drivers/qmimodem/voicecall.c
@@ -653,8 +653,6 @@ static void qmi_voicecall_remove(struct ofono_voicecall *vc)
ofono_voicecall_set_data(vc, NULL);
- qmi_service_unregister_all(data->voice);
-
qmi_service_unref(data->voice);
l_queue_destroy(data->call_list, l_free);