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/wctdm24xxp/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/wctdm24xxp/base.c')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |