diff options
-rw-r--r-- | src/mm-broadband-modem-qmi.c | 4 | ||||
-rw-r--r-- | src/mm-broadband-modem.c | 17 | ||||
-rw-r--r-- | src/mm-plugin-manager.c | 18 | ||||
-rw-r--r-- | src/mm-port-probe.c | 8 | ||||
-rw-r--r-- | src/mm-serial-port.c | 11 | ||||
-rw-r--r-- | src/mm-sms-qmi.c | 4 |
6 files changed, 24 insertions, 38 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index b76b791c..c7fc7d65 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -5295,8 +5295,8 @@ messaging_check_support (MMIfaceModemMessaging *self, /* We only handle 3GPP messaging (PDU based) currently, so just ignore * CDMA-only QMI modems */ if (mm_iface_modem_is_cdma_only (MM_IFACE_MODEM (self)) && supported) { - mm_info ("Messaging capabilities supported by this modem, " - "but 3GPP2 messaging not supported yet by ModemManager"); + mm_dbg ("Messaging capabilities supported by this modem, " + "but 3GPP2 messaging not supported yet by ModemManager"); supported = FALSE; } else mm_dbg ("Messaging capabilities %s by this modem", diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 4e1fb558..550a6938 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -5103,8 +5103,8 @@ cmgf_set_ready (MMBroadbandModem *self, g_error_free (error); self->priv->modem_messaging_sms_pdu_mode = FALSE; } else - mm_info ("Successfully set preferred SMS mode: '%s'", - self->priv->modem_messaging_sms_pdu_mode ? "PDU" : "text"); + mm_dbg ("Successfully set preferred SMS mode: '%s'", + self->priv->modem_messaging_sms_pdu_mode ? "PDU" : "text"); g_simple_async_result_set_op_res_gboolean (simple, TRUE); g_simple_async_result_complete (simple); @@ -7646,8 +7646,6 @@ disabling_context_complete_and_free (DisablingContext *ctx) MM_MODEM_STATE_CHANGE_REASON_USER_REQUESTED); else if (ctx->previous_state != MM_MODEM_STATE_DISABLED) { /* Fallback to previous state */ - mm_info ("Falling back to previous state '%s'", - mm_modem_state_get_string (ctx->previous_state)); mm_iface_modem_update_state (MM_IFACE_MODEM (ctx->self), ctx->previous_state, MM_MODEM_STATE_CHANGE_REASON_UNKNOWN); @@ -7760,7 +7758,6 @@ disabling_wait_for_final_state_ready (MMIfaceModem *self, * Note that we do consider here UNKNOWN and FAILED status on purpose, * as the MMManager will try to disable every modem before removing * it. */ - mm_info ("Modem is already fully disabled..."); g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); disabling_context_complete_and_free (ctx); return; @@ -7787,7 +7784,6 @@ disabling_step (DisablingContext *ctx) switch (ctx->step) { case DISABLING_STEP_FIRST: - mm_info ("Modem disabling..."); /* Fall down to next step */ ctx->step++; @@ -7907,7 +7903,6 @@ disabling_step (DisablingContext *ctx) ctx->step++; case DISABLING_STEP_LAST: - mm_info ("Modem fully disabled..."); ctx->disabled = TRUE; /* All disabled without errors! */ g_simple_async_result_set_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (ctx->result), TRUE); @@ -7977,8 +7972,6 @@ enabling_context_complete_and_free (EnablingContext *ctx) MM_MODEM_STATE_CHANGE_REASON_USER_REQUESTED); else if (ctx->previous_state != MM_MODEM_STATE_ENABLED) { /* Fallback to previous state */ - mm_info ("Falling back to previous state '%s'", - mm_modem_state_get_string (ctx->previous_state)); mm_iface_modem_update_state (MM_IFACE_MODEM (ctx->self), ctx->previous_state, MM_MODEM_STATE_CHANGE_REASON_UNKNOWN); @@ -8084,7 +8077,6 @@ enabling_wait_for_final_state_ready (MMIfaceModem *self, if (ctx->previous_state >= MM_MODEM_STATE_ENABLED) { /* Just return success, don't relaunch enabling */ - mm_info ("Modem is already fully enabled..."); g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); enabling_context_complete_and_free (ctx); return; @@ -8109,7 +8101,6 @@ enabling_step (EnablingContext *ctx) switch (ctx->step) { case ENABLING_STEP_FIRST: - mm_info ("Modem enabling..."); /* Fall down to next step */ ctx->step++; @@ -8229,7 +8220,6 @@ enabling_step (EnablingContext *ctx) ctx->step++; case ENABLING_STEP_LAST: - mm_info ("Modem fully enabled..."); ctx->enabled = TRUE; /* All enabled without errors! */ g_simple_async_result_set_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (ctx->result), TRUE); @@ -8525,7 +8515,6 @@ initialize_step (InitializeContext *ctx) switch (ctx->step) { case INITIALIZE_STEP_FIRST: - mm_info ("Modem initializing..."); /* Fall down to next step */ ctx->step++; @@ -8684,8 +8673,6 @@ initialize_step (InitializeContext *ctx) return; } - mm_info ("Modem fully initialized"); - /* All initialized without errors! * Set as disabled (a.k.a. initialized) */ mm_iface_modem_update_state (MM_IFACE_MODEM (ctx->self), diff --git a/src/mm-plugin-manager.c b/src/mm-plugin-manager.c index 42dcb3ff..3cd0e01a 100644 --- a/src/mm-plugin-manager.c +++ b/src/mm-plugin-manager.c @@ -505,13 +505,13 @@ build_plugins_list (MMPluginManager *self, if (self->priv->generic) list = g_list_append (list, g_object_ref (self->priv->generic)); - mm_info ("(Plugin Manager) [%s] Found '%u' plugins to try...", - g_udev_device_get_name (port), - g_list_length (list)); + mm_dbg ("(Plugin Manager) [%s] Found '%u' plugins to try...", + g_udev_device_get_name (port), + g_list_length (list)); for (l = list; l; l = g_list_next (l)) { - mm_info ("(Plugin Manager) [%s] Will try with plugin '%s'", - g_udev_device_get_name (port), - mm_plugin_get_name (MM_PLUGIN (l->data))); + mm_dbg ("(Plugin Manager) [%s] Will try with plugin '%s'", + g_udev_device_get_name (port), + mm_plugin_get_name (MM_PLUGIN (l->data))); } return list; @@ -744,7 +744,7 @@ load_plugins (MMPluginManager *self, if (!plugin) continue; - mm_info ("Loaded plugin '%s'", mm_plugin_get_name (plugin)); + mm_dbg ("Loaded plugin '%s'", mm_plugin_get_name (plugin)); if (g_str_equal (mm_plugin_get_name (plugin), MM_PLUGIN_GENERIC_NAME)) /* Generic plugin */ @@ -768,8 +768,8 @@ load_plugins (MMPluginManager *self, goto out; } - mm_info ("Successfully loaded %u plugins", - g_list_length (self->priv->plugins) + !!self->priv->generic); + mm_dbg ("Successfully loaded %u plugins", + g_list_length (self->priv->plugins) + !!self->priv->generic); out: if (dir) diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 263b6c42..5833666f 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -1148,10 +1148,10 @@ mm_port_probe_run (MMPortProbe *self, task->cancellable = g_cancellable_new (); probe_list_str = mm_port_probe_flag_build_string_from_mask (task->flags); - mm_info ("(%s/%s) launching port probing: '%s'", - g_udev_device_get_subsystem (self->priv->port), - g_udev_device_get_name (self->priv->port), - probe_list_str); + mm_dbg ("(%s/%s) launching port probing: '%s'", + g_udev_device_get_subsystem (self->priv->port), + g_udev_device_get_name (self->priv->port), + probe_list_str); g_free (probe_list_str); /* If any AT probing is needed, start by opening as AT port */ diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c index 47107616..2eab4a94 100644 --- a/src/mm-serial-port.c +++ b/src/mm-serial-port.c @@ -412,7 +412,7 @@ real_config_fd (MMSerialPort *self, int fd, GError **error) if (memcmp (&stbuf, &other, sizeof (other)) != 0) { mm_warn ("(%s): port attributes not fully set", - mm_port_get_device (MM_PORT (self))); + mm_port_get_device (MM_PORT (self))); } return TRUE; @@ -879,7 +879,7 @@ mm_serial_port_open (MMSerialPort *self, GError **error) goto success; } - mm_info ("(%s) opening serial port...", device); + mm_dbg ("(%s) opening serial port...", device); g_get_current_time (&tv_start); @@ -1007,7 +1007,7 @@ mm_serial_port_close (MMSerialPort *self) GTimeVal tv_start, tv_end; struct serial_struct sinfo = { 0 }; - mm_info ("(%s) closing serial port...", device); + mm_dbg ("(%s) closing serial port...", device); mm_port_set_connected (MM_PORT (self), FALSE); @@ -1038,7 +1038,7 @@ mm_serial_port_close (MMSerialPort *self) g_get_current_time (&tv_end); - mm_info ("(%s) serial port closed", device); + mm_dbg ("(%s) serial port closed", device); /* Some ports don't respond to data and when close is called * the serial layer waits up to 30 second (closing_wait) for @@ -1106,8 +1106,7 @@ mm_serial_port_close_force (MMSerialPort *self) if (priv->forced_close) return; - mm_info ("(%s) forced to close port", - mm_port_get_device (MM_PORT (self))); + mm_dbg ("(%s) forced to close port", mm_port_get_device (MM_PORT (self))); /* If already closed, done */ if (!priv->open_count) diff --git a/src/mm-sms-qmi.c b/src/mm-sms-qmi.c index fbdaeb02..d8a78a07 100644 --- a/src/mm-sms-qmi.c +++ b/src/mm-sms-qmi.c @@ -296,7 +296,7 @@ send_generic_ready (QmiClientWms *client, &rp_cause, &tp_cause, NULL)) { - mm_info ("Couldn't send SMS; RP cause (%u): '%s'; TP cause (%u): '%s'", + mm_warn ("Couldn't send SMS; RP cause (%u): '%s'; TP cause (%u): '%s'", rp_cause, qmi_wms_gsm_umts_rp_cause_get_string (rp_cause), tp_cause, @@ -410,7 +410,7 @@ send_from_storage_ready (QmiClientWms *client, &rp_cause, &tp_cause, NULL)) { - mm_info ("Couldn't send SMS; RP cause (%u): '%s'; TP cause (%u): '%s'", + mm_warn ("Couldn't send SMS; RP cause (%u): '%s'; TP cause (%u): '%s'", rp_cause, qmi_wms_gsm_umts_rp_cause_get_string (rp_cause), tp_cause, |