[PATCH 2/2] Refactor code order and remove unusable variables

[Zhenhua Zhang]

No impact to code correctness for voicecall.
---
 drivers/hfpmodem/voicecall.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index 60ac45d..4b75904 100644
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -99,10 +99,10 @@ static struct ofono_call *create_call(struct
voicecall_data *d, int type,
 		call->phone_number.type = num_type;
 	}
 
-	d->calls = g_slist_insert_sorted(d->calls, call,
at_util_call_compare);
-
 	call->clip_validity = clip;
 
+	d->calls = g_slist_insert_sorted(d->calls, call,
at_util_call_compare);
+
 	d->active_call = call;
 
 	return call;
@@ -138,8 +138,6 @@ static void atd_cb(gboolean ok, GAtResult *result,
gpointer user_data)
 	struct ofono_voicecall *vc = cbd->user;
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	ofono_voicecall_cb_t cb = cbd->cb;
-	int type = 128;
-	int validity = 2;
 	struct ofono_error error;
 	struct ofono_call *call;
 
@@ -150,7 +148,7 @@ static void atd_cb(gboolean ok, GAtResult *result,
gpointer user_data)
 	if (!ok)
 		goto out;
 
-	call = create_call(vd, 0, 0, CALL_STATUS_DIALING, NULL, type,
validity);
+	call = create_call(vd, 0, 0, CALL_STATUS_DIALING, NULL, 128, 2);
 
 	if (!call) {
 		ofono_error("Unable to allocate call, "
@@ -404,8 +402,7 @@ static void ciev_notify(GAtResult *result, gpointer
user_data)
 	struct ofono_voicecall *vc = user_data;
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct ofono_call *call = vd->active_call;
-	int index;
-	int value;
+	int index, value;
 	GAtResultIter iter;
 
 	g_at_result_iter_init(&iter, result);
-- 
1.6.2.5