diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2015-12-03 13:09:34 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-12-03 13:09:34 -0600 |
| commit | b090cf62d3849432d9013783c15c6d7ab94703d9 (patch) | |
| tree | c5c7bc04a3e6440e06b82b76f1c51bc814b8c008 | |
| parent | 001701caee26d3620fdf08b1bb26981ccca49f88 (diff) | |
| download | ofono-b090cf62d3849432d9013783c15c6d7ab94703d9.tar.bz2 | |
rilmodem: Get rid of ril_gprs_driver_data
| -rw-r--r-- | drivers/rilmodem/gprs.c | 25 | ||||
| -rw-r--r-- | drivers/rilmodem/gprs.h | 2 | ||||
| -rw-r--r-- | drivers/rilmodem/rilutil.h | 5 |
3 files changed, 9 insertions, 23 deletions
diff --git a/drivers/rilmodem/gprs.c b/drivers/rilmodem/gprs.c index 9bf84492..3c1d4511 100644 --- a/drivers/rilmodem/gprs.c +++ b/drivers/rilmodem/gprs.c @@ -461,11 +461,16 @@ static void get_active_data_calls(struct ofono_gprs *gprs) ofono_error("%s: send failed", __func__); } -void ril_gprs_start(struct ril_gprs_driver_data *driver_data, - struct ofono_gprs *gprs, struct ril_gprs_data *gd) +int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *userdata) { - gd->ril = g_ril_clone(driver_data->gril); - gd->modem = driver_data->modem; + GRil *ril = userdata; + struct ril_gprs_data *gd; + + gd = g_try_new0(struct ril_gprs_data, 1); + if (gd == NULL) + return -ENOMEM; + + gd->ril = g_ril_clone(ril); gd->ofono_attached = FALSE; gd->rild_status = -1; gd->tech = RADIO_TECH_UNKNOWN; @@ -473,18 +478,6 @@ void ril_gprs_start(struct ril_gprs_driver_data *driver_data, ofono_gprs_set_data(gprs, gd); get_active_data_calls(gprs); -} - -int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *data) -{ - struct ril_gprs_driver_data *driver_data = data; - struct ril_gprs_data *gd; - - gd = g_try_new0(struct ril_gprs_data, 1); - if (gd == NULL) - return -ENOMEM; - - ril_gprs_start(driver_data, gprs, gd); return 0; } diff --git a/drivers/rilmodem/gprs.h b/drivers/rilmodem/gprs.h index e744177d..67271e45 100644 --- a/drivers/rilmodem/gprs.h +++ b/drivers/rilmodem/gprs.h @@ -32,8 +32,6 @@ struct ril_gprs_data { int ril_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *data); void ril_gprs_remove(struct ofono_gprs *gprs); -void ril_gprs_start(struct ril_gprs_driver_data *driver_data, - struct ofono_gprs *gprs, struct ril_gprs_data *gd); 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); diff --git a/drivers/rilmodem/rilutil.h b/drivers/rilmodem/rilutil.h index bd5a5b11..857a63e6 100644 --- a/drivers/rilmodem/rilutil.h +++ b/drivers/rilmodem/rilutil.h @@ -79,11 +79,6 @@ struct ril_gprs_context_data { enum ofono_gprs_context_type type; }; -struct ril_gprs_driver_data { - GRil *gril; - struct ofono_modem *modem; -}; - typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata); void decode_ril_error(struct ofono_error *error, const char *final); |