diff options
author | Oron Peled <oron@actcom.co.il> | 2011-01-30 18:31:35 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-01-30 18:31:35 +0000 |
commit | 086e0d31c13fefbbf76e4859c2c9ef86b68c9c9f (patch) | |
tree | 498526e18bfd6836edd93739796ddce213a21fb2 /drivers/dahdi/xpp/card_bri.c | |
parent | 3af1adebba3b9a80237b34f89887cec9338d5eac (diff) |
xpp: remove unused XPD_STATE() "protocol method"
Folded XPD_STATE() "protocol method" into the card_state() method.
It was only called from these (otherwise empty) methods.
Also it is not a "protocol method" for a very very very long time.
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@9715 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/card_bri.c')
-rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index 13bb054..ede9d9a 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -1443,26 +1443,9 @@ static void BRI_card_pcm_tospan(xpd_t *xpd, xpacket_t *pack) } } -/*---------------- BRI: HOST COMMANDS -------------------------------------*/ -static /* 0x0F */ HOSTCMD(BRI, XPD_STATE, bool on) -{ - struct BRI_priv_data *priv; - BUG_ON(!xpd); - priv = xpd->priv; - XPD_DBG(GENERAL, xpd, "%s\n", (on)?"ON":"OFF"); - if(on) { - if(!test_bit(HFC_L1_ACTIVATED, &priv->l1_flags)) { - if( ! IS_NT(xpd)) - te_activation(xpd, 1); - else - nt_activation(xpd, 1); - } - } else if(IS_NT(xpd)) - nt_activation(xpd, 0); - return 0; -} +/*---------------- BRI: HOST COMMANDS -------------------------------------*/ static /* 0x33 */ HOSTCMD(BRI, SET_LED, enum bri_led_names which_led, enum led_state to_led_state) { @@ -1671,7 +1654,21 @@ end: static int BRI_card_state(xpd_t *xpd, bool on) { - return CALL_PROTO(BRI, XPD_STATE, xpd->xbus, xpd, on); + struct BRI_priv_data *priv; + + BUG_ON(!xpd); + priv = xpd->priv; + XPD_DBG(GENERAL, xpd, "%s\n", (on)?"ON":"OFF"); + if(on) { + if(!test_bit(HFC_L1_ACTIVATED, &priv->l1_flags)) { + if( ! IS_NT(xpd)) + te_activation(xpd, 1); + else + nt_activation(xpd, 1); + } + } else if(IS_NT(xpd)) + nt_activation(xpd, 0); + return 0; } static const struct xops bri_xops = { |