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 | |
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')
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 9 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_echocan_jpah.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_echocan_kb1.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_echocan_mg2.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_echocan_oslec.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_echocan_sec.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_echocan_sec2.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wcb4xxp/base.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wct4xxp/base.c | 5 | ||||
-rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 6 | ||||
-rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 1 |
11 files changed, 8 insertions, 20 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"); diff --git a/drivers/dahdi/dahdi_echocan_jpah.c b/drivers/dahdi/dahdi_echocan_jpah.c index 7bd41d7..9c684aa 100644 --- a/drivers/dahdi/dahdi_echocan_jpah.c +++ b/drivers/dahdi/dahdi_echocan_jpah.c @@ -54,7 +54,6 @@ static const struct dahdi_echocan_factory my_factory = { }; static const struct dahdi_echocan_ops my_ops = { - .name = "JPAH", .echocan_free = echo_can_free, .echocan_process = echo_can_process, .echocan_traintap = echo_can_traintap, diff --git a/drivers/dahdi/dahdi_echocan_kb1.c b/drivers/dahdi/dahdi_echocan_kb1.c index 7433d3e..3bf14c1 100644 --- a/drivers/dahdi/dahdi_echocan_kb1.c +++ b/drivers/dahdi/dahdi_echocan_kb1.c @@ -160,7 +160,6 @@ static const struct dahdi_echocan_features my_features = { }; static const struct dahdi_echocan_ops my_ops = { - .name = "KB1", .echocan_free = echo_can_free, .echocan_process = echo_can_process, .echocan_traintap = echo_can_traintap, diff --git a/drivers/dahdi/dahdi_echocan_mg2.c b/drivers/dahdi/dahdi_echocan_mg2.c index b2a102d..fc0e650 100644 --- a/drivers/dahdi/dahdi_echocan_mg2.c +++ b/drivers/dahdi/dahdi_echocan_mg2.c @@ -192,7 +192,6 @@ static const struct dahdi_echocan_features my_features = { }; static const struct dahdi_echocan_ops my_ops = { - .name = "MG2", .echocan_free = echo_can_free, .echocan_process = echo_can_process, .echocan_traintap = echo_can_traintap, diff --git a/drivers/dahdi/dahdi_echocan_oslec.c b/drivers/dahdi/dahdi_echocan_oslec.c index 661877c..496769a 100644 --- a/drivers/dahdi/dahdi_echocan_oslec.c +++ b/drivers/dahdi/dahdi_echocan_oslec.c @@ -55,7 +55,6 @@ static const struct dahdi_echocan_factory my_factory = { }; static const struct dahdi_echocan_ops my_ops = { - .name = "OSLEC", .echocan_free = echo_can_free, .echocan_process = echo_can_process, .echocan_traintap = echo_can_traintap, diff --git a/drivers/dahdi/dahdi_echocan_sec.c b/drivers/dahdi/dahdi_echocan_sec.c index 2f6876e..bd7cb90 100644 --- a/drivers/dahdi/dahdi_echocan_sec.c +++ b/drivers/dahdi/dahdi_echocan_sec.c @@ -98,7 +98,6 @@ static const struct dahdi_echocan_features my_features = { }; static const struct dahdi_echocan_ops my_ops = { - .name = "SEC", .echocan_free = echo_can_free, .echocan_process = echo_can_process, .echocan_traintap = echo_can_traintap, diff --git a/drivers/dahdi/dahdi_echocan_sec2.c b/drivers/dahdi/dahdi_echocan_sec2.c index f578f39..81b05fe 100644 --- a/drivers/dahdi/dahdi_echocan_sec2.c +++ b/drivers/dahdi/dahdi_echocan_sec2.c @@ -89,7 +89,6 @@ static const struct dahdi_echocan_factory my_factory = { }; static const struct dahdi_echocan_ops my_ops = { - .name = "SEC2", .echocan_free = echo_can_free, .echocan_process = echo_can_process, .echocan_traintap = echo_can_traintap, diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c index 172c0a4..2b09ed3 100644 --- a/drivers/dahdi/wcb4xxp/base.c +++ b/drivers/dahdi/wcb4xxp/base.c @@ -152,7 +152,6 @@ static const struct dahdi_echocan_features my_ec_features = { }; static const struct dahdi_echocan_ops my_ec_ops = { - .name = "HWEC", .echocan_free = echocan_free, }; diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 010b41e..71d98f8 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -406,12 +406,10 @@ static const struct dahdi_echocan_features vpm450m_ec_features = { }; static const struct dahdi_echocan_ops vpm400m_ec_ops = { - .name = "VPM400M", .echocan_free = echocan_free, }; static const struct dahdi_echocan_ops vpm450m_ec_ops = { - .name = "VPM450M", .echocan_free = echocan_free, }; #endif @@ -1308,7 +1306,8 @@ static int t4_echocan_create(struct dahdi_chan *chan, if (ecp->param_count > 0) { dev_warn(&wc->dev->dev, "%s echo canceller does not support " - "parameters; failing request\n", ops->name); + "parameters; failing request\n", + chan->ec_factory->name); return -EINVAL; } diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 18ea309..10f7ea8 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -268,12 +268,10 @@ static const struct dahdi_echocan_features vpm150m_ec_features = { }; static const struct dahdi_echocan_ops vpm100m_ec_ops = { - .name = "VPM100M", .echocan_free = echocan_free, }; static const struct dahdi_echocan_ops vpm150m_ec_ops = { - .name = "VPM150M", .echocan_free = echocan_free, }; @@ -1991,7 +1989,9 @@ static int wctdm_echocan_create(struct dahdi_chan *chan, } if (wc->vpm100 && (ecp->param_count > 0)) { - dev_warn(&wc->vb.pdev->dev, "%s echo canceller does not support parameters; failing request\n", ops->name); + dev_warn(&wc->vb.pdev->dev, "%s echo canceller does not " + "support parameters; failing request\n", + chan->ec_factory->name); return -EINVAL; } diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 426e2da..8631f98 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -82,7 +82,6 @@ static const struct dahdi_echocan_features vpm150m_ec_features = { }; static const struct dahdi_echocan_ops vpm150m_ec_ops = { - .name = "VPM150M", .echocan_free = echocan_free, }; |