summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2015-12-13 21:29:57 -0600
committerDenis Kenzior <denkenz@gmail.com>2015-12-13 21:29:57 -0600
commit5896f792e5ee6299d8d5e1bc12ede0ca1754dfe6 (patch)
tree2739918a4f7c5967af74028d9bed83e8faca7e66 /drivers
parent32516c48440a24d0bd83416628953ebc8602111f (diff)
downloadofono-5896f792e5ee6299d8d5e1bc12ede0ca1754dfe6.tar.bz2
rilmodem: Get rid of ril_sim_data
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rilmodem/rilutil.h6
-rw-r--r--drivers/rilmodem/sim.c11
2 files changed, 1 insertions, 16 deletions
diff --git a/drivers/rilmodem/rilutil.h b/drivers/rilmodem/rilutil.h
index 857a63e6..48f20d5f 100644
--- a/drivers/rilmodem/rilutil.h
+++ b/drivers/rilmodem/rilutil.h
@@ -67,12 +67,6 @@ enum at_util_charset {
RIL_UTIL_CHARSET_8859_H = 0x10000,
};
-struct ril_sim_data {
- struct ofono_modem *modem;
- GRil *gril;
- ofono_sim_state_event_cb_t ril_state_watch;
-};
-
struct ril_gprs_context_data {
GRil *gril;
struct ofono_modem *modem;
diff --git a/drivers/rilmodem/sim.c b/drivers/rilmodem/sim.c
index 1dda4e98..3cc20bb3 100644
--- a/drivers/rilmodem/sim.c
+++ b/drivers/rilmodem/sim.c
@@ -1353,17 +1353,11 @@ static gboolean listen_and_get_sim_status(gpointer user)
static gboolean ril_sim_register(gpointer user)
{
struct ofono_sim *sim = user;
- struct sim_data *sd = ofono_sim_get_data(sim);
DBG("");
ofono_sim_register(sim);
- if (sd->ril_state_watch != NULL &&
- !ofono_sim_add_state_watch(sim, sd->ril_state_watch,
- sd->modem, NULL))
- ofono_error("Error registering ril sim watch");
-
/*
* We use g_idle_add here to make sure that the presence of the SIM
* interface is signalled before signalling anything else from the said
@@ -1377,8 +1371,7 @@ static gboolean ril_sim_register(gpointer user)
static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
void *data)
{
- struct ril_sim_data *ril_data = data;
- GRil *ril = ril_data->gril;
+ GRil *ril = data;
struct sim_data *sd;
int i;
@@ -1391,8 +1384,6 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
sd->app_type = RIL_APPTYPE_UNKNOWN;
sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
sd->passwd_type = OFONO_SIM_PASSWORD_NONE;
- sd->modem = ril_data->modem;
- sd->ril_state_watch = ril_data->ril_state_watch;
for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
sd->retries[i] = -1;