diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-11-12 19:22:07 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-11-12 19:22:07 +0000 |
| commit | 1edbb6e8896637e76fe0f954822241e8449711a3 (patch) | |
| tree | 1e817251a85e3ce33f2ec1d5badbab8944839596 | |
| parent | cf387b572201de05f39314b310da35ca82e829d2 (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
| -rw-r--r-- | drivers/dahdi/voicebus/GpakCust.c | 2 | ||||
| -rw-r--r-- | drivers/dahdi/voicebus/GpakCust.h | 3 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 2 |
3 files changed, 3 insertions, 4 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; diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 72fcb9a..8d66f13 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -349,7 +349,7 @@ static int config_vpmadt032(struct vpmadt032 *vpm, struct t1 *wc) 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; |