diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2015-11-05 20:59:38 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-11-05 20:59:38 -0600 |
| commit | 2d770c375ebd93e03f6dc8c7d169724980c8c683 (patch) | |
| tree | 8cc8df40f2383335301490460e058bc13130ef2d | |
| parent | 8a01d8acedcffeafe48367e7539ba59bdf07b088 (diff) | |
| download | ofono-2d770c375ebd93e03f6dc8c7d169724980c8c683.tar.bz2 | |
rilmodem: Get rid of pointless g_idle_add
| -rw-r--r-- | drivers/rilmodem/radio-settings.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/drivers/rilmodem/radio-settings.c b/drivers/rilmodem/radio-settings.c index 235e2586..a3ec1d58 100644 --- a/drivers/rilmodem/radio-settings.c +++ b/drivers/rilmodem/radio-settings.c @@ -214,12 +214,11 @@ static void ril_set_fast_dormancy(struct ofono_radio_settings *rs, } } -static ofono_bool_t query_available_rats_cb(gpointer user_data) +static void ril_query_available_rats(struct ofono_radio_settings *rs, + ofono_radio_settings_available_rats_query_cb_t cb, + void *data) { unsigned int available_rats; - struct cb_data *cbd = user_data; - ofono_radio_settings_available_rats_query_cb_t cb = cbd->cb; - struct ofono_radio_settings *rs = cbd->user; struct ofono_modem *modem = ofono_radio_settings_get_modem(rs); available_rats = OFONO_RADIO_ACCESS_MODE_GSM @@ -228,20 +227,7 @@ static ofono_bool_t query_available_rats_cb(gpointer user_data) if (ofono_modem_get_boolean(modem, MODEM_PROP_LTE_CAPABLE)) available_rats |= OFONO_RADIO_ACCESS_MODE_LTE; - CALLBACK_WITH_SUCCESS(cb, available_rats, cbd->data); - - g_free(cbd); - - return FALSE; -} - -static void ril_query_available_rats(struct ofono_radio_settings *rs, - ofono_radio_settings_available_rats_query_cb_t cb, - void *data) -{ - struct cb_data *cbd = cb_data_new(cb, data, rs); - - g_idle_add(query_available_rats_cb, cbd); + CALLBACK_WITH_SUCCESS(cb, available_rats, data); } static void ril_delayed_register(const struct ofono_error *error, |