From bee063dd76ae15dc0f081904336a4d9a18f24bdb Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Sat, 16 Jun 2012 08:17:22 -0500 Subject: sim: Revert adding special callback for EFad This reverts commit 5522df64fac7b57d3d9db2272fc9be97c8815b94. --- src/sim.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/sim.c') diff --git a/src/sim.c b/src/sim.c index afb94ff2..3d4eece4 100644 --- a/src/sim.c +++ b/src/sim.c @@ -1721,20 +1721,6 @@ static void sim_cphs_information_read_cb(int ok, int length, int record, memcpy(sim->cphs_service_table, data + 1, 2); } -static void sim_mccmnc_cb(const struct ofono_error *error, - const char *mcc, const char *mnc, void *userdata) -{ - struct ofono_sim *sim = userdata; - - if (error->type != OFONO_ERROR_TYPE_NO_ERROR) - return; - - if (!mcc || !mnc) - return; - - sim->mnc_length = strlen(mnc); -} - static void sim_ad_read_cb(int ok, int length, int record, const unsigned char *data, int record_length, void *userdata) @@ -1742,11 +1728,8 @@ static void sim_ad_read_cb(int ok, int length, int record, struct ofono_sim *sim = userdata; int new_mnc_length; - if (!ok) { - if (sim->driver->read_mccmnc) - sim->driver->read_mccmnc(sim, sim_mccmnc_cb, sim); + if (!ok) return; - } if (length < 4) return; -- cgit v1.2.3