summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2009-10-28 19:23:25 -0500
committerDenis Kenzior <denkenz@gmail.com>2009-10-28 19:23:25 -0500
commitb3dccdfd548afc38618fc08904b15861e199e4c3 (patch)
treeaee7d115d6a32cc5a2c862b168cabe2c9f8f2e22
parent2c5ea9d4ee6c1c7fd81eec297a1c6fe7cbeb2489 (diff)
downloadofono-b3dccdfd548afc38618fc08904b15861e199e4c3.tar.bz2
Fix: Don't pass the indexes
These can be obtained inside the function anyway
-rw-r--r--drivers/hfpmodem/voicecall.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index 64c1e79f..1d26b0ec 100644
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -398,10 +398,11 @@ static void release_call(struct ofono_voicecall *vc, struct ofono_call *call)
}
static void ciev_call_notify(struct ofono_voicecall *vc,
- struct ofono_call *call,
- unsigned int call_pos, unsigned int value)
+ struct ofono_call *call,
+ unsigned int value)
{
struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ unsigned int call_pos = vd->cind_pos[HFP_INDICATOR_CALL];
if (vd->mpty_call == FALSE) {
switch (value) {
@@ -421,11 +422,12 @@ static void ciev_call_notify(struct ofono_voicecall *vc,
}
static void ciev_callsetup_notify(struct ofono_voicecall *vc,
- struct ofono_call *call,
- unsigned int callsetup_pos, unsigned int value)
+ struct ofono_call *call,
+ unsigned int value)
{
struct voicecall_data *vd = ofono_voicecall_get_data(vc);
- int call_pos = vd->cind_pos[HFP_INDICATOR_CALL];
+ unsigned int callsetup_pos = vd->cind_pos[HFP_INDICATOR_CALLSETUP];
+ unsigned int call_pos = vd->cind_pos[HFP_INDICATOR_CALL];
if (vd->mpty_call == FALSE) {
switch (value) {
@@ -472,9 +474,9 @@ static void ciev_notify(GAtResult *result, gpointer user_data)
return;
if (index == vd->cind_pos[HFP_INDICATOR_CALL])
- ciev_call_notify(vc, call, index, value);
+ ciev_call_notify(vc, call, value);
else if (index == vd->cind_pos[HFP_INDICATOR_CALLSETUP])
- ciev_callsetup_notify(vc, call, index, value);
+ ciev_callsetup_notify(vc, call, value);
}
static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)