[dahdi-commits] sruffell: linux/trunk r7568 - in /linux/trunk/drivers/dahdi: voicebus/ wcte12xp/

[SVN commits to the DAHDI project]

Author: sruffell
Date: Thu Nov 12 13:22:07 2009
New Revision: 7568

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7568
Log:
voicebus: Remove redundant MAX_CHANNELS_FROM_SPAN

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.c
    linux/trunk/drivers/dahdi/voicebus/GpakCust.h
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.c?view=diff&rev=7568&r1=7567&r2=7568
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.c Thu Nov 12 13:22:07 2009
@@ -377,7 +377,7 @@
 		unsigned int channel;
 
 		channel = order->channel;
-		BUG_ON(channel >= MAX_CHANNELS_PER_SPAN);
+		BUG_ON(channel >= ARRAY_SIZE(vpm->curecstate));
 		old = &vpm->curecstate[channel];
 		new = &order->params;
 

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.h?view=diff&rev=7568&r1=7567&r2=7568
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.h (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.h Thu Nov 12 13:22:07 2009
@@ -105,7 +105,6 @@
 
 struct GpakChannelConfig;
 
-#define MAX_CHANNELS_PER_SPAN 32
 struct vpmadt032 {
 	void *context;
 	struct work_struct work;
@@ -116,7 +115,7 @@
 	unsigned char curpage;
 	unsigned short version;
 	enum adt_companding companding;
-	struct adt_lec_params curecstate[MAX_CHANNELS_PER_SPAN];
+	struct adt_lec_params curecstate[MAX_CHANNELS];
 	spinlock_t change_list_lock;
 	struct list_head change_list;
 	spinlock_t list_lock;

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7568&r1=7567&r2=7568
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Thu Nov 12 13:22:07 2009
@@ -349,7 +349,7 @@
 		return -1;
 	}
 
-	for (channel = 0; channel < MAX_CHANNELS_PER_SPAN; ++channel) {
+	for (channel = 0; channel < ARRAY_SIZE(vpm->curecstate); ++channel) {
 		vpm->curecstate[channel].tap_length = 0;
 		vpm->curecstate[channel].nlp_type = vpm->options.vpmnlptype;
 		vpm->curecstate[channel].nlp_threshold = vpm->options.vpmnlpthresh;