summaryrefslogtreecommitdiff
path: root/drivers/dahdi/xpp/card_global.c
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-01-30 14:14:14 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-01-30 14:14:14 +0000
commit12efc4bad60d197754df29080c2de66d98041e5a (patch)
tree00241d7c5c38817a2fd68a4ae6065d45ba1e4a39 /drivers/dahdi/xpp/card_global.c
parent5ad21bfc23dc09b0e2acd0763e83b107b4e1dc80 (diff)
xpp: phonedev: Cleanup method macros
* Caller to CALL_XMETHOD() no longer need to explicitly pass xbus (calculate xpd->xbus) * Create CALL_PHONE_METHOD() similar to CALL_XMETHOD() -- inlining the extra parameters (more readable) * Reverse parameter order in PHONE_METHOD() and CALL_PHONE_METHOD() to be consistent with XMETHOD() and CALL_XMETHOD() * Rename XPD_STATE phonedev method to card_state: - Consistency with other phonedev methods. - These calls now Wrap internal calls to XPD_STATE protocol HOSTCMD in PRI, BRI, FXS, FXO Signed-off-by: Oron Peled <oron@actcom.co.il> Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9706 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/card_global.c')
-rw-r--r--drivers/dahdi/xpp/card_global.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c
index ecb79fd..ba66b9e 100644
--- a/drivers/dahdi/xpp/card_global.c
+++ b/drivers/dahdi/xpp/card_global.c
@@ -685,7 +685,11 @@ HANDLER_DEF(GLOBAL, REGISTER_REPLY)
dump_reg_cmd("REG_REPLY", 0, xbus, xpd->addr.unit, reg->portnum, reg);
dump_packet("REG_REPLY", pack, 1);
}
- return CALL_XMETHOD(card_register_reply, xbus, xpd, reg);
+ if (! XMETHOD(card_register_reply, xpd)) {
+ XPD_ERR(xpd, "REGISTER_REPLY: without card_register_reply() method\n");
+ return -EINVAL;
+ }
+ return CALL_XMETHOD(card_register_reply, xpd, reg);
}
HANDLER_DEF(GLOBAL, SYNC_REPLY)