From 1c9ed8af0e7a4a7bac505ff74eb874593a3adb3e Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Sun, 29 Nov 2015 15:53:46 -0600 Subject: rilmodem: Remove unused ril_util_sim_state_query --- drivers/rilmodem/rilutil.c | 58 ---------------------------------------------- drivers/rilmodem/rilutil.h | 7 ------ 2 files changed, 65 deletions(-) diff --git a/drivers/rilmodem/rilutil.c b/drivers/rilmodem/rilutil.c index 4e2aec17..16c03108 100644 --- a/drivers/rilmodem/rilutil.c +++ b/drivers/rilmodem/rilutil.c @@ -39,19 +39,6 @@ #include "util.h" #include "ril_constants.h" -struct ril_util_sim_state_query { - GRil *ril; - guint cpin_poll_source; - guint cpin_poll_count; - guint interval; - guint num_times; - ril_util_sim_inserted_cb_t cb; - void *userdata; - GDestroyNotify destroy; -}; - -static gboolean cpin_check(gpointer userdata); - void decode_ril_error(struct ofono_error *error, const char *final) { if (!strcmp(final, "OK")) { @@ -63,15 +50,6 @@ void decode_ril_error(struct ofono_error *error, const char *final) } } -static gboolean cpin_check(gpointer userdata) -{ - struct ril_util_sim_state_query *req = userdata; - - req->cpin_poll_source = 0; - - return FALSE; -} - gchar *ril_util_get_netmask(const gchar *address) { char *result; @@ -109,42 +87,6 @@ gchar *ril_util_get_netmask(const gchar *address) return result; } -struct ril_util_sim_state_query *ril_util_sim_state_query_new(GRil *ril, - guint interval, guint num_times, - ril_util_sim_inserted_cb_t cb, - void *userdata, - GDestroyNotify destroy) -{ - struct ril_util_sim_state_query *req; - - req = g_new0(struct ril_util_sim_state_query, 1); - - req->ril = ril; - req->interval = interval; - req->num_times = num_times; - req->cb = cb; - req->userdata = userdata; - req->destroy = destroy; - - cpin_check(req); - - return req; -} - -void ril_util_sim_state_query_free(struct ril_util_sim_state_query *req) -{ - if (req == NULL) - return; - - if (req->cpin_poll_source > 0) - g_source_remove(req->cpin_poll_source); - - if (req->destroy) - req->destroy(req->userdata); - - g_free(req); -} - void ril_util_build_deactivate_data_call(GRil *gril, struct parcel *rilp, int cid, unsigned int reason) { diff --git a/drivers/rilmodem/rilutil.h b/drivers/rilmodem/rilutil.h index 7d7cf420..a2b775f7 100644 --- a/drivers/rilmodem/rilutil.h +++ b/drivers/rilmodem/rilutil.h @@ -89,13 +89,6 @@ typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata); void decode_ril_error(struct ofono_error *error, const char *final); gchar *ril_util_get_netmask(const char *address); -struct ril_util_sim_state_query *ril_util_sim_state_query_new(GRil *ril, - guint interval, guint num_times, - ril_util_sim_inserted_cb_t cb, - void *userdata, - GDestroyNotify destroy); -void ril_util_sim_state_query_free(struct ril_util_sim_state_query *req); - void ril_util_build_deactivate_data_call(GRil *gril, struct parcel *rilp, int cid, unsigned int reason); -- cgit v1.2.3