[PATCH 1/3] voicecall: Rename cb-function hangup to hangup_active in core and drivers.

From: Sjur Brændeland <sjur(a)sjur-laptop.(none)&gt; --- drivers/atmodem/voicecall.c | 4 ++-- drivers/calypsomodem/voicecall.c | 2 +- drivers/hfpmodem/voicecall.c | 2 +- drivers/isimodem/voicecall.c | 2 +- drivers/stemodem/voicecall.c | 2 +- include/voicecall.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c index fce9144..2578779 100644 --- a/drivers/atmodem/voicecall.c +++ b/drivers/atmodem/voicecall.c @@ -409,7 +409,7 @@ static void at_answer(struct ofono_voicecall *vc, static void at_hangup(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data) { - /* Hangup all calls */ + /* Hangup active call */ at_template("AT+CHUP", vc, generic_cb, 0x3f, cb, data); } @@ -874,7 +874,7 @@ static struct ofono_voicecall_driver driver = { .remove = at_voicecall_remove, .dial = at_dial, .answer = at_answer, - .hangup = at_hangup, + .hangup_active = at_hangup, .hold_all_active = at_hold_all_active, .release_all_held = at_release_all_held, .set_udub = at_set_udub, diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c index 511d533..56ec5a9 100644 --- a/drivers/calypsomodem/voicecall.c +++ b/drivers/calypsomodem/voicecall.c @@ -407,7 +407,7 @@ static struct ofono_voicecall_driver driver = { .remove = calypso_voicecall_remove, .dial = calypso_dial, .answer = calypso_answer, - .hangup = calypso_hangup, + .hangup_active = calypso_hangup, .hold_all_active = calypso_hold_all_active, .release_all_held = calypso_release_all_held, .set_udub = calypso_set_udub, diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index f83f26a..69923cc 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -1166,7 +1166,7 @@ static struct ofono_voicecall_driver driver = { .remove = hfp_voicecall_remove, .dial = hfp_dial, .answer = hfp_answer, - .hangup = hfp_hangup, + .hangup_active = hfp_hangup, .hold_all_active = hfp_hold_all_active, .release_all_held = hfp_release_all_held, .set_udub = hfp_set_udub, diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c index 3e28dae..4b720be 100644 --- a/drivers/isimodem/voicecall.c +++ b/drivers/isimodem/voicecall.c @@ -1318,7 +1318,7 @@ static struct ofono_voicecall_driver driver = { .remove = isi_voicecall_remove, .dial = isi_dial, .answer = isi_answer, - .hangup = isi_hangup, + .hangup_active = isi_hangup, .hold_all_active = isi_hold_all_active, .release_all_held = isi_release_all_held, .set_udub = isi_set_udub, diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c index a56709a..daadf54 100644 --- a/drivers/stemodem/voicecall.c +++ b/drivers/stemodem/voicecall.c @@ -569,7 +569,7 @@ static struct ofono_voicecall_driver driver = { .remove = ste_voicecall_remove, .dial = ste_dial, .answer = ste_answer, - .hangup = ste_hangup, + .hangup_active = ste_hangup, .hold_all_active = ste_hold_all_active, .release_all_held = ste_release_all_held, .set_udub = ste_set_udub, diff --git a/include/voicecall.h b/include/voicecall.h index 6ceb3d8..998c02d 100644 --- a/include/voicecall.h +++ b/include/voicecall.h @@ -67,7 +67,7 @@ struct ofono_voicecall_driver { ofono_voicecall_cb_t cb, void *data); void (*answer)(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data); - void (*hangup)(struct ofono_voicecall *vc, + void (*hangup_active)(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data); void (*hold_all_active)(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data); -- 1.6.3.3