summaryrefslogtreecommitdiff
path: root/drivers/dahdi/voicebus
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2009-11-12 19:22:07 +0000
committerShaun Ruffell <sruffell@digium.com>2009-11-12 19:22:07 +0000
commit1edbb6e8896637e76fe0f954822241e8449711a3 (patch)
tree1e817251a85e3ce33f2ec1d5badbab8944839596 /drivers/dahdi/voicebus
parentcf387b572201de05f39314b310da35ca82e829d2 (diff)
voicebus: Remove redundant MAX_CHANNELS_FROM_SPAN
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7568 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/voicebus')
-rw-r--r--drivers/dahdi/voicebus/GpakCust.c2
-rw-r--r--drivers/dahdi/voicebus/GpakCust.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dahdi/voicebus/GpakCust.c b/drivers/dahdi/voicebus/GpakCust.c
index db2122f..2ba7876 100644
--- a/drivers/dahdi/voicebus/GpakCust.c
+++ b/drivers/dahdi/voicebus/GpakCust.c
@@ -377,7 +377,7 @@ static void vpmadt032_bh(struct work_struct *data)
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;
diff --git a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h
index 11d1d88..0fa8107 100644
--- a/drivers/dahdi/voicebus/GpakCust.h
+++ b/drivers/dahdi/voicebus/GpakCust.h
@@ -105,7 +105,6 @@ struct vpmadt032_options {
struct GpakChannelConfig;
-#define MAX_CHANNELS_PER_SPAN 32
struct vpmadt032 {
void *context;
struct work_struct work;
@@ -116,7 +115,7 @@ struct vpmadt032 {
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;