diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2015-11-13 16:10:30 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-11-13 16:10:30 -0600 |
| commit | 65398ce382a299ec02d64a74fd59ca70e57425ef (patch) | |
| tree | c1e60b5d1109c6fb27438f613bca6e93b43b7071 | |
| parent | 418ca19f25dde1d46f5670d01da134f9b578793f (diff) | |
| download | ofono-65398ce382a299ec02d64a74fd59ca70e57425ef.tar.bz2 | |
rilmodem: Simplify ril_gprs_set_attached
| -rw-r--r-- | drivers/rilmodem/gprs.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/rilmodem/gprs.c b/drivers/rilmodem/gprs.c index 75dcfcc0..510e2bd3 100644 --- a/drivers/rilmodem/gprs.c +++ b/drivers/rilmodem/gprs.c @@ -115,24 +115,9 @@ static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data) ril_gprs_registration_status(gprs, NULL, NULL); } -gboolean ril_gprs_set_attached_cb(gpointer user_data) -{ - struct cb_data *cbd = user_data; - ofono_gprs_cb_t cb = cbd->cb; - - DBG(""); - - CALLBACK_WITH_SUCCESS(cb, cbd->data); - g_free(cbd); - - /* Run once per g_idle_add() call */ - return FALSE; -} - static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached, ofono_gprs_cb_t cb, void *data) { - struct cb_data *cbd = cb_data_new(cb, data, NULL); struct ril_gprs_data *gd = ofono_gprs_get_data(gprs); DBG("attached: %d", attached); @@ -149,12 +134,7 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached, * are met. */ gd->ofono_attached = attached; - - /* - * Call from idle loop, so core can set driver_attached before - * the callback is invoked. - */ - g_idle_add(ril_gprs_set_attached_cb, cbd); + CALLBACK_WITH_SUCCESS(cb, data); } static gboolean ril_get_status_retry(gpointer user_data) |