aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksandermj@chromium.org>2023-10-26 07:47:48 +0000
committerAleksander Morgado <aleksandermj@chromium.org>2023-10-26 12:35:50 +0000
commit5e088fb3bb79b53fdd8943a67e2ebf0f7d9dd14c (patch)
treeb4cb7c82992aa7a2ce0f6fc67b0f8a9d07e81363
parent81d2655950a3fc2381c81708074f10e665e75660 (diff)
modem-helpers-mbim: minor method rename
-rw-r--r--src/mm-bearer-mbim.c4
-rw-r--r--src/mm-broadband-modem-mbim.c6
-rw-r--r--src/mm-modem-helpers-mbim.c6
-rw-r--r--src/mm-modem-helpers-mbim.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c
index cbf03443..03eb3789 100644
--- a/src/mm-bearer-mbim.c
+++ b/src/mm-bearer-mbim.c
@@ -718,7 +718,7 @@ connect_set_ready (MbimDevice *device,
activation_state != MBIM_ACTIVATION_STATE_ACTIVATED &&
activation_state != MBIM_ACTIVATION_STATE_ACTIVATING) {
g_clear_error (&error);
- error = mm_mobile_equipment_error_from_mbim_nw_error (nw_error, self);
+ error = mm_error_from_mbim_nw_error (nw_error, self);
}
}
@@ -1499,7 +1499,7 @@ disconnect_set_ready (MbimDevice *device,
if (g_error_matches (error, MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_FAILURE) && parsed_result && nw_error != 0) {
g_assert (!inner_error);
g_error_free (error);
- error = mm_mobile_equipment_error_from_mbim_nw_error (nw_error, self);
+ error = mm_error_from_mbim_nw_error (nw_error, self);
/* error out with nw_error error */
goto out;
}
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index 63821c9c..8b2eaaa2 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -5078,7 +5078,7 @@ basic_connect_notification_connect (MMBroadbandModemMbim *self,
ReportDisconnectedStatusContext ctx;
g_autoptr(GError) connection_error = NULL;
- connection_error = mm_mobile_equipment_error_from_mbim_nw_error (nw_error, self);
+ connection_error = mm_error_from_mbim_nw_error (nw_error, self);
mm_obj_dbg (self, "session ID '%u' was deactivated: %s", session_id, connection_error->message);
@@ -6781,7 +6781,7 @@ register_state_set_ready (MbimDevice *device,
* a big issue. */
if (nw_error) {
g_clear_error (&error);
- error = mm_mobile_equipment_error_from_mbim_nw_error (nw_error, self);
+ error = mm_error_from_mbim_nw_error (nw_error, self);
}
}
}
@@ -9738,7 +9738,7 @@ packet_service_set_ready (MbimDevice *device,
/* Prefer the NW error if available */
if (nw_error) {
g_clear_error (&error);
- error = mm_mobile_equipment_error_from_mbim_nw_error (nw_error, self);
+ error = mm_error_from_mbim_nw_error (nw_error, self);
}
}
}
diff --git a/src/mm-modem-helpers-mbim.c b/src/mm-modem-helpers-mbim.c
index 2b4659fb..c73592a6 100644
--- a/src/mm-modem-helpers-mbim.c
+++ b/src/mm-modem-helpers-mbim.c
@@ -460,10 +460,10 @@ static const MMMobileEquipmentError mbim_nw_errors[] = {
};
GError *
-mm_mobile_equipment_error_from_mbim_nw_error (MbimNwError nw_error,
- gpointer log_object)
+mm_error_from_mbim_nw_error (MbimNwError nw_error,
+ gpointer log_object)
{
- const gchar *msg;
+ const gchar *msg;
if (nw_error < G_N_ELEMENTS (mbim_nw_errors)) {
MMMobileEquipmentError error_code;
diff --git a/src/mm-modem-helpers-mbim.h b/src/mm-modem-helpers-mbim.h
index 89c1f752..5cb01d8c 100644
--- a/src/mm-modem-helpers-mbim.h
+++ b/src/mm-modem-helpers-mbim.h
@@ -56,8 +56,8 @@ GList *mm_3gpp_network_info_list_from_mbim_providers (const MbimProvider *const
MbimPinType mbim_pin_type_from_mm_modem_3gpp_facility (MMModem3gppFacility facility);
MMModem3gppFacility mm_modem_3gpp_facility_from_mbim_pin_type (MbimPinType pin_type);
-GError *mm_mobile_equipment_error_from_mbim_nw_error (MbimNwError nw_error,
- gpointer log_object);
+GError *mm_error_from_mbim_nw_error (MbimNwError nw_error,
+ gpointer log_object);
MMBearerAllowedAuth mm_bearer_allowed_auth_from_mbim_auth_protocol (MbimAuthProtocol auth_protocol);
MbimAuthProtocol mm_bearer_allowed_auth_to_mbim_auth_protocol (MMBearerAllowedAuth bearer_auth,