diff options
| author | Kinsey Moore <kmoore@digium.com> | 2010-12-09 20:19:21 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2010-12-09 20:19:21 +0000 |
| commit | 2c00501000487765fe74037315e144c596c09a20 (patch) | |
| tree | 796bc5c53364d102df44fc308a0d0424d9c35178 /drivers/dahdi/dahdi-base.c | |
| parent | d6aabd12e0c79bac96b8c8a1d5ef725fbb1c4075 (diff) | |
dahdi-base, kernel, dahdi_echocan_*, wcb4xxp, wct4xxp, wctdm24xxp, wcte12xp: Remove name field from echocan ops
This field was redundant and was only used in places where the factory's name could be used.
Signed-off-by: Kinsey Moore <kmoore@digium.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9523 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi-base.c')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 132018a..1f20176 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -798,12 +798,9 @@ static int dahdi_proc_read(char *page, char **start, off_t off, int count, int * chan->chan_alarms); if (chan->ec_factory) - len += snprintf(page+len, count-len, "(ECTYPE: %s) ", - chan->ec_factory->name); - - if (chan->ec_state) - len += snprintf(page+len, count-len, "(EC: %s) ", - chan->ec_state->ops->name); + len += snprintf(page+len, count-len, "(EC: %s - %s) ", + chan->ec_factory->name, + chan->ec_state ? "ACTIVE" : "INACTIVE"); len += snprintf(page+len, count-len, "\n"); |