[v2,3/7] qmi: Remove qmi_device_set_close_on_unref

Commit Message

Denis Kenzior Feb. 21, 2024, 4:23 p.m. UTC

The only caller of this method always sets close_on_unref to true.
Since the underlying file descriptor is no longer exposed, it is safe to
remove this method and assume that the file descriptor should always be
closed when qmi_device is cleaned up.
---
 drivers/qmimodem/qmi.c | 13 +------------
 drivers/qmimodem/qmi.h |  2 --
 plugins/gobi.c         |  2 --
 3 files changed, 1 insertion(+), 16 deletions(-)

Patch

diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index 7bfb4bc0d74b..07af29b42b36 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -63,7 +63,6 @@  struct qmi_device {
 	int ref_count;
 	int fd;
 	GIOChannel *io;
-	bool close_on_unref;
 	guint read_watch;
 	guint write_watch;
 	struct l_queue *req_queue;
@@ -924,7 +923,6 @@  static int qmi_device_init(struct qmi_device *device, int fd,
 	device->ref_count = 1;
 
 	device->fd = fd;
-	device->close_on_unref = false;
 
 	flags = fcntl(device->fd, F_GETFL, NULL);
 	if (flags < 0)
@@ -994,8 +992,7 @@  void qmi_device_unref(struct qmi_device *device)
 	if (device->read_watch > 0)
 		g_source_remove(device->read_watch);
 
-	if (device->close_on_unref)
-		close(device->fd);
+	close(device->fd);
 
 	if (device->shutdown_source)
 		g_source_remove(device->shutdown_source);
@@ -1021,14 +1018,6 @@  void qmi_device_set_debug(struct qmi_device *device,
 	device->debug_data = user_data;
 }
 
-void qmi_device_set_close_on_unref(struct qmi_device *device, bool do_close)
-{
-	if (!device)
-		return;
-
-	device->close_on_unref = do_close;
-}
-
 void qmi_result_print_tlvs(struct qmi_result *result)
 {
 	const void *ptr = result->data;
diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h
index 410ada04d8d7..ab0ee479c89d 100644
--- a/drivers/qmimodem/qmi.h
+++ b/drivers/qmimodem/qmi.h
@@ -87,8 +87,6 @@  void qmi_device_unref(struct qmi_device *device);
 void qmi_device_set_debug(struct qmi_device *device,
 				qmi_debug_func_t func, void *user_data);
 
-void qmi_device_set_close_on_unref(struct qmi_device *device, bool do_close);
-
 bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 				void *user_data, qmi_destroy_func_t destroy);
 bool qmi_device_shutdown(struct qmi_device *device, qmi_shutdown_func_t func,
diff --git a/plugins/gobi.c b/plugins/gobi.c
index 07994666ded5..e22b8146cf93 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -435,8 +435,6 @@  static int gobi_enable(struct ofono_modem *modem)
 	if (getenv("OFONO_QMI_DEBUG"))
 		qmi_device_set_debug(data->device, gobi_debug, "QMI: ");
 
-	qmi_device_set_close_on_unref(data->device, true);
-
 	qmi_device_discover(data->device, discover_cb, modem, NULL);
 
 	return -EINPROGRESS;