From cb2ca76bae8d6dc4163596b645c374ae61799a74 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 3 Dec 2015 13:13:36 -0600 Subject: rilmodem: Get rid of unnecessary exports --- drivers/rilmodem/gprs.c | 37 +++++++++++++++++++------------------ drivers/rilmodem/gprs.h | 10 ---------- 2 files changed, 19 insertions(+), 28 deletions(-) (limited to 'drivers') diff --git a/drivers/rilmodem/gprs.c b/drivers/rilmodem/gprs.c index 3c1d4511..533e2ae3 100644 --- a/drivers/rilmodem/gprs.c +++ b/drivers/rilmodem/gprs.c @@ -98,21 +98,6 @@ static int ril_tech_to_bearer_tech(int ril_tech) } } -static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data) -{ - struct ofono_gprs *gprs = user_data; - struct ril_gprs_data *gd = ofono_gprs_get_data(gprs); - - g_ril_print_unsol_no_args(gd->ril, message); - - /* - * We just want to track network data status if ofono - * itself is attached, so we avoid unnecessary data state requests. - */ - if (gd->ofono_attached == TRUE) - ril_gprs_registration_status(gprs, NULL, NULL); -} - static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached, ofono_gprs_cb_t cb, void *data) { @@ -290,7 +275,7 @@ error: CALLBACK_WITH_FAILURE(cb, -1, cbd->data); } -void ril_gprs_registration_status(struct ofono_gprs *gprs, +static void ril_gprs_registration_status(struct ofono_gprs *gprs, ofono_gprs_status_cb_t cb, void *data) { struct ril_gprs_data *gd = ofono_gprs_get_data(gprs); @@ -361,6 +346,21 @@ error: ofono_gprs_remove(gprs); } +static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data) +{ + struct ofono_gprs *gprs = user_data; + struct ril_gprs_data *gd = ofono_gprs_get_data(gprs); + + g_ril_print_unsol_no_args(gd->ril, message); + + /* + * We just want to track network data status if ofono + * itself is attached, so we avoid unnecessary data state requests. + */ + if (gd->ofono_attached == TRUE) + ril_gprs_registration_status(gprs, NULL, NULL); +} + static void query_max_cids(struct ofono_gprs *gprs) { struct ril_gprs_data *gd = ofono_gprs_get_data(gprs); @@ -461,7 +461,8 @@ static void get_active_data_calls(struct ofono_gprs *gprs) ofono_error("%s: send failed", __func__); } -int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *userdata) +static int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, + void *userdata) { GRil *ril = userdata; struct ril_gprs_data *gd; @@ -482,7 +483,7 @@ int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *userdata) return 0; } -void ril_gprs_remove(struct ofono_gprs *gprs) +static void ril_gprs_remove(struct ofono_gprs *gprs) { struct ril_gprs_data *gd = ofono_gprs_get_data(gprs); diff --git a/drivers/rilmodem/gprs.h b/drivers/rilmodem/gprs.h index 67271e45..91d25803 100644 --- a/drivers/rilmodem/gprs.h +++ b/drivers/rilmodem/gprs.h @@ -29,13 +29,3 @@ struct ril_gprs_data { int tech; int pending_deact_req; }; - -int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *data); -void ril_gprs_remove(struct ofono_gprs *gprs); -gboolean ril_gprs_set_attached_cb(gpointer user_data); -void ril_gprs_registration_status(struct ofono_gprs *gprs, - ofono_gprs_status_cb_t cb, void *data); -void ril_gprs_set_ia_apn(struct ofono_gprs *gprs, const char *apn, - enum ofono_gprs_proto proto, const char *user, - const char *passwd, const char *mccmnc, - ofono_gprs_cb_t cb, void *data); -- cgit v1.2.3