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

core: minor coding style changes

Browse Source
This commit is contained in:
Aleksander Morgado
2016-08-10 09:49:40 +02:00
parent f670861939
commit 048667ffc2
5 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-base-modem.c
-1
View File
@@ -411,7 +411,6 @@ mm_base_modem_get_reprobe (MMBaseModem *self)
return self->priv->reprobe;
}
gboolean
mm_base_modem_get_valid (MMBaseModem *self)
{
src/mm-broadband-modem.c
+3 -8
View File
@@ -6871,7 +6871,7 @@ modem_cdma_setup_cleanup_unsolicited_events (MMBroadbandModem *self,
gboolean setup,
GAsyncReadyCallback callback,
gpointer user_data)
{
{
CdmaUnsolicitedEventsContext *ctx;
GByteArray *logcmd;
u_int16_t log_items[] = { DM_LOG_ITEM_EVDO_PILOT_SETS_V2, 0 };
@@ -10022,13 +10022,10 @@ initialize_step (InitializeContext *ctx)
gboolean is_sim_hot_swap_supported = FALSE;
g_object_get (ctx->self,
MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED,
&is_sim_hot_swap_supported,
MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED, &is_sim_hot_swap_supported,
NULL);
if (!is_sim_hot_swap_supported) {
ctx->self->priv->sim_hot_swap_ports_ctx = NULL;
} else {
if (is_sim_hot_swap_supported) {
PortsContext *ports;
GError *error = NULL;
@@ -10110,7 +10107,6 @@ initialize_step (InitializeContext *ctx)
mm_iface_modem_voice_shutdown (MM_IFACE_MODEM_VOICE (ctx->self));
mm_iface_modem_time_shutdown (MM_IFACE_MODEM_TIME (ctx->self));
mm_iface_modem_simple_shutdown (MM_IFACE_MODEM_SIMPLE (ctx->self));
}
initialize_context_complete_and_free (ctx);
return;
@@ -10275,7 +10271,6 @@ after_hotswap_event_disable_ready (MMBaseModem *self,
}
}
void
mm_broadband_modem_update_sim_hot_swap_detected (MMBroadbandModem *self)
{
src/mm-broadband-modem.h
-2
View File
@@ -130,6 +130,4 @@ void mm_broadband_modem_unlock_sms_storages (MMBroadbandModem *self,
/* Helper to update SIM hot swap */
void mm_broadband_modem_update_sim_hot_swap_detected (MMBroadbandModem *self);
#endif /* MM_BROADBAND_MODEM_H */
src/mm-device.c
+1 -3
View File
@@ -489,15 +489,13 @@ modem_valid (MMBaseModem *modem,
MMDevice *self)
{
if (!mm_base_modem_get_valid (modem)) {
GDBusObjectManagerServer *object_manager = self->priv->object_manager;
/* Modem no longer valid */
mm_device_remove_modem (self);
if (mm_base_modem_get_reprobe (modem)) {
GError *error = NULL;
if (!mm_device_create_modem (self, object_manager, &error)) {
if (!mm_device_create_modem (self, self->priv->object_manager, &error)) {
mm_warn ("Could not recreate modem for device at '%s': %s",
mm_device_get_path (self),
error ? error->message : "unknown");
src/mm-iface-modem.c
+3 -6
View File
@@ -4747,14 +4747,11 @@ interface_initialization_step (InitializationContext *ctx)
gboolean is_sim_hot_swap_supported = FALSE;
g_object_get (ctx->self,
MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED,
&is_sim_hot_swap_supported,
MM_IFACE_MODEM_SIM_HOT_SWAP_SUPPORTED, &is_sim_hot_swap_supported,
NULL);
if (is_sim_hot_swap_supported) {
mm_iface_modem_update_failed_state (ctx->self,
MM_MODEM_STATE_FAILED_REASON_SIM_MISSING);
}
if (is_sim_hot_swap_supported)
mm_iface_modem_update_failed_state (ctx->self, MM_MODEM_STATE_FAILED_REASON_SIM_MISSING);
}
g_simple_async_result_take_error (ctx->result, ctx->fatal_error);
ctx->fatal_error = NULL;