From e4d65f6cda3bc12b2e887c20a667ed98a897bbd9 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 5 Nov 2015 21:19:40 -0600 Subject: [PATCH] rilmodem: Implement ril_set_rat_mode inline --- drivers/rilmodem/radio-settings.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/rilmodem/radio-settings.c b/drivers/rilmodem/radio-settings.c index ccbd2970..0672b6ca 100644 --- a/drivers/rilmodem/radio-settings.c +++ b/drivers/rilmodem/radio-settings.c @@ -92,14 +92,19 @@ static void ril_set_rat_mode(struct ofono_radio_settings *rs, break; } - g_ril_request_set_preferred_network_type(rd->ril, pref, &rilp); + parcel_init(&rilp); + + parcel_w_int32(&rilp, 1); /* Number of params */ + parcel_w_int32(&rilp, pref); + + g_ril_append_print_buf(rd->ril, "(%d)", pref); if (g_ril_send(rd->ril, RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, - &rilp, ril_set_rat_cb, cbd, g_free) == 0) { - ofono_error("%s: unable to set rat mode", __func__); - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, data); - } + &rilp, ril_set_rat_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + CALLBACK_WITH_FAILURE(cb, data); } static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)