modem-helpers-mbim: minor method rename

This commit is contained in:
Aleksander Morgado
2023-10-26 12:35:50 +00:00
parent 81d2655950
commit 5e088fb3bb
4 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -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;
}
+3 -3
View File
@@ -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);
}
}
}
+3 -3
View File
@@ -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;
+2 -2
View File
@@ -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,