[svn-commits] tzafrir: linux/trunk r4509 - /linux/trunk/drivers/dahdi/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Jul  2 08:02:29 2008
New Revision: 4509

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4509
Log:
Remove unneeded case for #ifdef DAHDI_SPANSTAT_V2 - 
this is always the case for dahdi.

Modified:
    linux/trunk/drivers/dahdi/xpp/card_bri.c
    linux/trunk/drivers/dahdi/xpp/card_fxo.c
    linux/trunk/drivers/dahdi/xpp/card_fxs.c
    linux/trunk/drivers/dahdi/xpp/card_pri.c
    linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c

Modified: linux/trunk/drivers/dahdi/xpp/card_bri.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_bri.c?view=diff&rev=4509&r1=4508&r2=4509
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_bri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_bri.c Wed Jul  2 08:02:29 2008
@@ -673,9 +673,7 @@
 		/* Nothing to do yet */
 		return 0;
 	}
-#ifdef DAHDI_SPANSTAT_V2 
 	xpd->span.spantype = "BRI";
-#endif 
 	xpd->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS;
 	xpd->span.deflaw = DAHDI_LAW_ALAW;
 	BIT_SET(xpd->digital_signalling, 2);	/* D-Channel */

Modified: linux/trunk/drivers/dahdi/xpp/card_fxo.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_fxo.c?view=diff&rev=4509&r1=4508&r2=4509
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_fxo.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_fxo.c Wed Jul  2 08:02:29 2008
@@ -500,9 +500,7 @@
 	priv = xpd->priv;
 	BUG_ON(!priv);
 	XPD_DBG(GENERAL, xpd, "%s\n", (on)?"ON":"OFF");
-#ifdef DAHDI_SPANSTAT_V2 
 	xpd->span.spantype = "FXO";
-#endif 
 	for_each_line(xpd, i) {
 		struct dahdi_chan	*cur_chan = &xpd->chans[i];
 

Modified: linux/trunk/drivers/dahdi/xpp/card_fxs.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_fxs.c?view=diff&rev=4509&r1=4508&r2=4509
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_fxs.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_fxs.c Wed Jul  2 08:02:29 2008
@@ -477,9 +477,7 @@
 	priv = xpd->priv;
 	BUG_ON(!priv);
 	XPD_DBG(GENERAL, xpd, "%s\n", (on)?"on":"off");
-#ifdef DAHDI_SPANSTAT_V2 
 	xpd->span.spantype = "FXS";
-#endif 
 	for_each_line(xpd, i) {
 		struct dahdi_chan	*cur_chan = &xpd->chans[i];
 

Modified: linux/trunk/drivers/dahdi/xpp/card_pri.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_pri.c?view=diff&rev=4509&r1=4508&r2=4509
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_pri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_pri.c Wed Jul  2 08:02:29 2008
@@ -885,9 +885,7 @@
 		/* Nothing to do yet */
 		return 0;
 	}
-#ifdef DAHDI_SPANSTAT_V2 
 	xpd->span.spantype = pri_protocol_name(priv->pri_protocol);
-#endif 
 	xpd->span.linecompat = pri_linecompat(priv->pri_protocol);
 	xpd->span.deflaw = priv->deflaw;
 	for_each_line(xpd, i) {

Modified: linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=4509&r1=4508&r2=4509
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c Wed Jul  2 08:02:29 2008
@@ -918,7 +918,6 @@
 	span->hooksig = xpp_hooksig;	/* Only with RBS bits */
 	span->ioctl = xpp_ioctl;
 	span->maint = xpp_maint;
-#ifdef DAHDI_SPANSTAT_V2 
 	/*
 	 * This actually describe the dahdi_spaninfo version 3
 	 * A bunch of unrelated data exported via a modified ioctl()
@@ -951,7 +950,6 @@
 	 * No irq's for you today!
 	 */
 	span->irq = 0;
-#endif 
 #ifdef	DAHDI_SYNC_TICK
 	span->sync_tick = dahdi_sync_tick;
 #endif