colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcom-soc: simplify QMI port lookup for BAM-DMUX

Browse Source 
mm_broadband_modem_qmi_peek_port_qmi() already looks up a QMI port
exactly the same way it is implemented in the BAM-DMUX variant of
peek_port_qmi_for_data(), so we can just reuse it to simplify the code.

No functional change.
This commit is contained in:
Stephan Gerhold
2022-08-11 14:08:35 +02:00
parent 8b8b5c22f7
commit 4ab459109d
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
View File

@@ -47,7 +47,6 @@ peek_port_qmi_for_data_bam_dmux (MMBroadbandModemQmi *self,
QmiSioPort *out_sio_port, QmiSioPort *out_sio_port,
GError **error) GError **error)
{ {
GList *rpmsg_qmi_ports;
MMPortQmi *found = NULL; MMPortQmi *found = NULL;
MMKernelDevice *net_port; MMKernelDevice *net_port;
gint net_port_number; gint net_port_number;
@@ -66,24 +65,16 @@ peek_port_qmi_for_data_bam_dmux (MMBroadbandModemQmi *self,
} }
/* Find one QMI port, we don't care which one */ /* Find one QMI port, we don't care which one */
rpmsg_qmi_ports = mm_base_modem_find_ports (MM_BASE_MODEM (self), found = mm_broadband_modem_qmi_peek_port_qmi (self);
MM_PORT_SUBSYS_UNKNOWN,
MM_PORT_TYPE_QMI); if (!found)
if (!rpmsg_qmi_ports) {
g_set_error (error, g_set_error (error,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_NOT_FOUND, MM_CORE_ERROR_NOT_FOUND,
"Couldn't find any QMI port for 'net/%s'", "Couldn't find any QMI port for 'net/%s'",
mm_port_get_device (data)); mm_port_get_device (data));
return NULL; else if (out_sio_port)
}
/* Set outputs */
if (out_sio_port)
*out_sio_port = sio_port_per_port_number[net_port_number]; *out_sio_port = sio_port_per_port_number[net_port_number];
found = MM_PORT_QMI (rpmsg_qmi_ports->data);
g_list_free_full (rpmsg_qmi_ports, g_object_unref);
return found; return found;
} }