diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2015-11-05 20:56:13 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-11-05 20:56:13 -0600 |
| commit | 8a01d8acedcffeafe48367e7539ba59bdf07b088 (patch) | |
| tree | e59c774d83b8b26d0b1cb9739be3758eab7d8313 /drivers | |
| parent | b7af1278cbbb9a10b6ea33159627ffd1dbb754b9 (diff) | |
| download | ofono-8a01d8acedcffeafe48367e7539ba59bdf07b088.tar.bz2 | |
rilmodem: Get rid of ril_radio_settings_driver_data
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rilmodem/radio-settings.c | 10 | ||||
| -rw-r--r-- | drivers/rilmodem/rilutil.h | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/drivers/rilmodem/radio-settings.c b/drivers/rilmodem/radio-settings.c index fe09e27d..235e2586 100644 --- a/drivers/rilmodem/radio-settings.c +++ b/drivers/rilmodem/radio-settings.c @@ -47,7 +47,6 @@ struct radio_data { GRil *ril; - struct ofono_modem *modem; gboolean fast_dormancy; gboolean pending_fd; }; @@ -221,12 +220,12 @@ static ofono_bool_t query_available_rats_cb(gpointer user_data) struct cb_data *cbd = user_data; ofono_radio_settings_available_rats_query_cb_t cb = cbd->cb; struct ofono_radio_settings *rs = cbd->user; - struct radio_data *rd = ofono_radio_settings_get_data(rs); + struct ofono_modem *modem = ofono_radio_settings_get_modem(rs); available_rats = OFONO_RADIO_ACCESS_MODE_GSM | OFONO_RADIO_ACCESS_MODE_UMTS; - if (ofono_modem_get_boolean(rd->modem, MODEM_PROP_LTE_CAPABLE)) + if (ofono_modem_get_boolean(modem, MODEM_PROP_LTE_CAPABLE)) available_rats |= OFONO_RADIO_ACCESS_MODE_LTE; CALLBACK_WITH_SUCCESS(cb, available_rats, cbd->data); @@ -259,11 +258,10 @@ static void ril_delayed_register(const struct ofono_error *error, static int ril_radio_settings_probe(struct ofono_radio_settings *rs, unsigned int vendor, void *user) { - struct ril_radio_settings_driver_data *rs_init_data = user; + GRil *ril = user; struct radio_data *rsd = g_new0(struct radio_data, 1); - rsd->ril = g_ril_clone(rs_init_data->gril); - rsd->modem = rs_init_data->modem; + rsd->ril = g_ril_clone(ril); ofono_radio_settings_set_data(rs, rsd); diff --git a/drivers/rilmodem/rilutil.h b/drivers/rilmodem/rilutil.h index 4efd36c3..3c918d34 100644 --- a/drivers/rilmodem/rilutil.h +++ b/drivers/rilmodem/rilutil.h @@ -89,11 +89,6 @@ struct ril_gprs_driver_data { struct ofono_modem *modem; }; -struct ril_radio_settings_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); |