[v2,11/33] qmi: Rename qmi_device_new_qrtr to qmi_qrtr_node_new

Commit Message

Denis Kenzior June 18, 2024, 8:01 p.m. UTC

This better reflects the terminology used on the QRTR bus.  A 'node'
parameter is introduced.  It is currently unused, but in the future will
be used to specify which node is being addressed by the created object.
---
 drivers/qmimodem/qmi.c   | 2 +-
 drivers/qmimodem/qmi.h   | 2 +-
 plugins/qrtrqmi.c        | 2 +-
 unit/test-qmimodem-qmi.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index c3b1f7fef64f..a845e3809090 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -2310,7 +2310,7 @@  static const struct qmi_device_ops qrtr_ops = {
 	.destroy = qmi_device_qrtr_destroy,
 };
 
-struct qmi_device *qmi_device_new_qrtr(void)
+struct qmi_device *qmi_qrtr_node_new(uint32_t node)
 {
 	struct qmi_device_qrtr *qrtr;
 	int fd;
diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h
index 604e4e7e8659..10202fba6128 100644
--- a/drivers/qmimodem/qmi.h
+++ b/drivers/qmimodem/qmi.h
@@ -88,8 +88,8 @@  bool qmi_device_set_expected_data_format(struct qmi_device *device,
 			enum qmi_device_expected_data_format format);
 
 struct qmi_device *qmi_device_new_qmux(const char *device);
-struct qmi_device *qmi_device_new_qrtr(void);
 
+struct qmi_device *qmi_qrtr_node_new(uint32_t node);
 struct qmi_service *qmi_qrtr_node_get_service(struct qmi_device *device,
 						uint32_t type);
 
diff --git a/plugins/qrtrqmi.c b/plugins/qrtrqmi.c
index f75742f98508..adf6625e2824 100644
--- a/plugins/qrtrqmi.c
+++ b/plugins/qrtrqmi.c
@@ -208,7 +208,7 @@  static int qrtrqmi_enable(struct ofono_modem *modem)
 
 	DBG("%p", modem);
 
-	data->node = qmi_device_new_qrtr();
+	data->node = qmi_qrtr_node_new(0);
 	if (!data->node)
 		return -EIO;
 
diff --git a/unit/test-qmimodem-qmi.c b/unit/test-qmimodem-qmi.c
index 07560aadcc49..0fedd9803bb5 100644
--- a/unit/test-qmimodem-qmi.c
+++ b/unit/test-qmimodem-qmi.c
@@ -153,7 +153,7 @@  static struct test_info *test_setup(void)
 
 	info = l_new(struct test_info, 1);
 	setup_test_qrtr_services(info);
-	info->node = qmi_device_new_qrtr();
+	info->node = qmi_qrtr_node_new(0);
 	assert(info->node);
 
 	/* Enable ofono logging */