[2/4] qmi: Rename qmi_device_unref to qmi_device_free

Commit Message

Denis Kenzior Feb. 22, 2024, 5:14 p.m. UTC

Since reference counting wasn't used, rename qmi_device_unref to
qmi_device_free.
---
 drivers/qmimodem/qmi.c | 8 +-------
 drivers/qmimodem/qmi.h | 2 +-
 plugins/gobi.c         | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

Patch

diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index 2dde31b11c7c..8587766efe1f 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -63,7 +63,6 @@  struct qmi_device_ops {
 };
 
 struct qmi_device {
-	int ref_count;
 	int fd;
 	GIOChannel *io;
 	guint read_watch;
@@ -920,8 +919,6 @@  static int qmi_device_init(struct qmi_device *device, int fd,
 
 	__debug_device(device, "device %p new", device);
 
-	device->ref_count = 1;
-
 	device->fd = fd;
 
 	flags = fcntl(device->fd, F_GETFL, NULL);
@@ -967,14 +964,11 @@  static void __qmi_device_shutdown_finished(struct qmi_device *device)
 		device->ops->destroy(device);
 }
 
-void qmi_device_unref(struct qmi_device *device)
+void qmi_device_free(struct qmi_device *device)
 {
 	if (!device)
 		return;
 
-	if (__sync_sub_and_fetch(&device->ref_count, 1))
-		return;
-
 	__debug_device(device, "device %p free", device);
 
 	l_queue_destroy(device->control_queue, __request_free);
diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h
index 14ad84e5006a..ef2140faad9c 100644
--- a/drivers/qmimodem/qmi.h
+++ b/drivers/qmimodem/qmi.h
@@ -81,7 +81,7 @@  typedef void (*qmi_debug_func_t)(const char *str, void *user_data);
 typedef void (*qmi_shutdown_func_t)(void *user_data);
 typedef void (*qmi_discover_func_t)(void *user_data);
 
-void qmi_device_unref(struct qmi_device *device);
+void qmi_device_free(struct qmi_device *device);
 
 void qmi_device_set_debug(struct qmi_device *device,
 				qmi_debug_func_t func, void *user_data);
diff --git a/plugins/gobi.c b/plugins/gobi.c
index 4134c62d398e..2b29afbefdbe 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -147,7 +147,7 @@  static void gobi_remove(struct ofono_modem *modem)
 
 	cleanup_services(data);
 
-	qmi_device_unref(data->device);
+	qmi_device_free(data->device);
 
 	g_free(data);
 }
@@ -161,7 +161,7 @@  static void shutdown_cb(void *user_data)
 
 	data->discover_attempts = 0;
 
-	qmi_device_unref(data->device);
+	qmi_device_free(data->device);
 	data->device = NULL;
 
 	ofono_modem_set_powered(modem, FALSE);