From 561ab0d34a91d3821d24a99726f713989b364135 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 3 Dec 2015 12:59:09 -0600 Subject: rilmodem: Remove data reg state query retry logic This is no longer needed as the query for max_cid is done in a different logic flow. --- drivers/rilmodem/gprs.c | 25 ------------------------- drivers/rilmodem/gprs.h | 1 - 2 files changed, 26 deletions(-) diff --git a/drivers/rilmodem/gprs.c b/drivers/rilmodem/gprs.c index 56f53473..51f4f96e 100644 --- a/drivers/rilmodem/gprs.c +++ b/drivers/rilmodem/gprs.c @@ -135,18 +135,6 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached, CALLBACK_WITH_SUCCESS(cb, data); } -static gboolean ril_get_status_retry(gpointer user_data) -{ - struct ofono_gprs *gprs = user_data; - struct ril_gprs_data *gd = ofono_gprs_get_data(gprs); - - gd->status_retry_cb_id = 0; - - ril_gprs_registration_status(gprs, NULL, NULL); - - return FALSE; -} - static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data) { struct cb_data *cbd = user_data; @@ -298,16 +286,6 @@ error_free: g_strfreev(strv); error: - - /* - * For some modems DATA_REGISTRATION_STATE will return an error until we - * are registered in the voice network. - */ - if (old_status == -1 && message->error == RIL_E_GENERIC_FAILURE) - gd->status_retry_cb_id = - g_timeout_add(GET_STATUS_TIMER_MS, - ril_get_status_retry, gprs); - if (cb) CALLBACK_WITH_FAILURE(cb, -1, cbd->data); } @@ -520,9 +498,6 @@ void ril_gprs_remove(struct ofono_gprs *gprs) DBG(""); - if (gd->status_retry_cb_id != 0) - g_source_remove(gd->status_retry_cb_id); - ofono_gprs_set_data(gprs, NULL); g_ril_unref(gd->ril); diff --git a/drivers/rilmodem/gprs.h b/drivers/rilmodem/gprs.h index 219ffbb1..fd7aadcc 100644 --- a/drivers/rilmodem/gprs.h +++ b/drivers/rilmodem/gprs.h @@ -29,7 +29,6 @@ struct ril_gprs_data { int tech; int state_changed_unsol; int pending_deact_req; - guint status_retry_cb_id; }; int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *data); -- cgit v1.2.3