[PATCH] plugins: remove unnecessary MM_BASE_MODEM() casts
Ben Chan
benchan at chromium.org
Tue May 20 09:56:50 PDT 2014
---
plugins/huawei/mm-sim-huawei.c | 2 +-
plugins/icera/mm-broadband-bearer-icera.c | 4 ++--
plugins/mbm/mm-broadband-bearer-mbm.c | 2 +-
plugins/option/mm-broadband-bearer-hso.c | 4 ++--
plugins/sierra/mm-broadband-bearer-sierra.c | 10 +++++-----
plugins/sierra/mm-sim-sierra.c | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/plugins/huawei/mm-sim-huawei.c b/plugins/huawei/mm-sim-huawei.c
index 7bf4106..62fc41e 100644
--- a/plugins/huawei/mm-sim-huawei.c
+++ b/plugins/huawei/mm-sim-huawei.c
@@ -117,7 +117,7 @@ load_sim_identifier (MMSim *self,
mm_dbg ("loading (Huawei) SIM identifier...");
mm_base_modem_at_command (
- MM_BASE_MODEM (modem),
+ modem,
"^ICCID?",
5,
FALSE,
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c
index 82b9a58..4507a61 100644
--- a/plugins/icera/mm-broadband-bearer-icera.c
+++ b/plugins/icera/mm-broadband-bearer-icera.c
@@ -136,7 +136,7 @@ ip_config_ready (MMBaseModem *modem,
guint i;
guint dns_i;
- response = mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error);
+ response = mm_base_modem_at_command_full_finish (modem, res, &error);
if (error) {
g_simple_async_result_take_error (ctx->result, error);
get_ip_config_context_complete_and_free (ctx);
@@ -422,7 +422,7 @@ disconnect_ipdpact_ready (MMBaseModem *modem,
return;
}
- mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error);
+ mm_base_modem_at_command_full_finish (modem, res, &error);
if (error) {
self->priv->disconnect_pending = NULL;
g_simple_async_result_take_error (ctx->result, error);
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c
index 72e53ac..ed78643 100644
--- a/plugins/mbm/mm-broadband-bearer-mbm.c
+++ b/plugins/mbm/mm-broadband-bearer-mbm.c
@@ -502,7 +502,7 @@ disconnect_enap_ready (MMBaseModem *modem,
GError *error = NULL;
/* Ignore errors for now */
- mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error);
+ mm_base_modem_at_command_full_finish (modem, res, &error);
if (error) {
mm_dbg ("Disconnection failed (not fatal): %s", error->message);
g_error_free (error);
diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c
index 4b128e5..15d9551 100644
--- a/plugins/option/mm-broadband-bearer-hso.c
+++ b/plugins/option/mm-broadband-bearer-hso.c
@@ -100,7 +100,7 @@ ip_config_ready (MMBaseModem *modem,
guint i;
guint dns_i;
- response = mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error);
+ response = mm_base_modem_at_command_full_finish (modem, res, &error);
if (error) {
g_simple_async_result_take_error (ctx->result, error);
get_ip_config_context_complete_and_free (ctx);
@@ -736,7 +736,7 @@ disconnect_owancall_ready (MMBaseModem *modem,
GError *error = NULL;
/* Ignore errors for now */
- mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error);
+ mm_base_modem_at_command_full_finish (modem, res, &error);
if (error) {
mm_dbg ("Disconnection failed (not fatal): %s", error->message);
g_error_free (error);
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c
index 3c8b56b..67cb3f2 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.c
+++ b/plugins/sierra/mm-broadband-bearer-sierra.c
@@ -109,7 +109,7 @@ scact_ready (MMBaseModem *modem,
{
GError *error = NULL;
- if (!mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error)) {
+ if (!mm_base_modem_at_command_full_finish (modem, res, &error)) {
g_simple_async_result_take_error (ctx->result, error);
dial_3gpp_context_complete_and_free (ctx);
return;
@@ -127,7 +127,7 @@ authenticate_ready (MMBaseModem *modem,
{
GError *error = NULL;
- if (!mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error)) {
+ if (!mm_base_modem_at_command_full_finish (modem, res, &error)) {
g_simple_async_result_take_error (ctx->result, error);
dial_3gpp_context_complete_and_free (ctx);
return;
@@ -145,7 +145,7 @@ cgatt_ready (MMBaseModem *modem,
{
GError *error = NULL;
- if (!mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error)) {
+ if (!mm_base_modem_at_command_full_finish (modem, res, &error)) {
g_simple_async_result_take_error (ctx->result, error);
dial_3gpp_context_complete_and_free (ctx);
return;
@@ -174,7 +174,7 @@ dial_3gpp_context_step (Dial3gppContext *ctx)
ctx->step++;
case DIAL_3GPP_STEP_PS_ATTACH:
- mm_base_modem_at_command_full (MM_BASE_MODEM (ctx->modem),
+ mm_base_modem_at_command_full (ctx->modem,
ctx->primary,
"+CGATT=1",
10,
@@ -359,7 +359,7 @@ disconnect_scact_ready (MMBaseModem *modem,
GError *error = NULL;
/* Ignore errors for now */
- mm_base_modem_at_command_full_finish (MM_BASE_MODEM (modem), res, &error);
+ mm_base_modem_at_command_full_finish (modem, res, &error);
if (error) {
mm_dbg ("Disconnection failed (not fatal): %s", error->message);
g_error_free (error);
diff --git a/plugins/sierra/mm-sim-sierra.c b/plugins/sierra/mm-sim-sierra.c
index d8a4715..a0f0f45 100644
--- a/plugins/sierra/mm-sim-sierra.c
+++ b/plugins/sierra/mm-sim-sierra.c
@@ -105,7 +105,7 @@ load_sim_identifier (MMSim *self,
mm_dbg ("loading (Sierra) SIM identifier...");
mm_base_modem_at_command (
- MM_BASE_MODEM (modem),
+ modem,
"!ICCID?",
3,
FALSE,
--
1.9.1.423.g4596e3a
More information about the ModemManager-devel
mailing list