From: Marit Henriksen <marit.henriksen(a)stericsson.com&gt; When adding the use of pin event *EPEV also to at_pin_send_puk_cb, it becomes identical to at_pin_send_cb, and can be removed. --- New patch, this one should apply:) drivers/atmodem/sim.c | 44 +------------------------------------------- 1 files changed, 1 insertions(+), 43 deletions(-) diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index 3abd1d8..9cfdc65 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -647,48 +647,6 @@ error: CALLBACK_WITH_FAILURE(cb, data); } -static void at_pin_send_puk_cb(gboolean ok, GAtResult *result, - gpointer user_data) -{ - struct cb_data *cbd = user_data; - struct sim_data *sd = cbd->user; - ofono_sim_lock_unlock_cb_t cb = cbd->cb; - struct ofono_error error; - - decode_at_error(&error, g_at_result_final_response(result)); - - if (!ok) - goto done; - - switch (sd->vendor) { - case OFONO_VENDOR_IFX: - /* - * On the IFX modem, AT+CPIN? can return READY too - * early and so use +XSIM notification to detect - * the ready state of the SIM. - */ - sd->ready_id = g_at_chat_register(sd->chat, "+XSIM", - at_xsim_notify, - FALSE, cbd, g_free); - return; - case OFONO_VENDOR_MBM: - /* - * On the MBM modem, AT+CPIN? keeps returning SIM PIN - * for a moment after successful AT+CPIN="..", but then - * sends *EPEV when that changes. - */ - sd->ready_id = g_at_chat_register(sd->chat, "*EPEV", - at_epev_notify, - FALSE, cbd, g_free); - return; - } - -done: - cb(&error, cbd->data); - - g_free(cbd); -} - static void at_pin_send_puk(struct ofono_sim *sim, const char *puk, const char *passwd, ofono_sim_lock_unlock_cb_t cb, void *data) @@ -706,7 +664,7 @@ static void at_pin_send_puk(struct ofono_sim *sim, const char *puk, snprintf(buf, sizeof(buf), "AT+CPIN=\"%s\",\"%s\"", puk, passwd); ret = g_at_chat_send(sd->chat, buf, none_prefix, - at_pin_send_puk_cb, cbd, NULL); + at_pin_send_cb, cbd, NULL); memset(buf, 0, sizeof(buf)); -- 1.7.0.4