From 1f024713ed63bf0ef2c332349415903fbab8ef80 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 13 Jan 2014 12:58:36 -0600 Subject: [PATCH] wct4xxp: Trivial drop of unnecessary local variables. These were left over from when the VPM callbacks depended on the different VPM installed. On the wcte43x this is unnecessary. Signed-off-by: Shaun Ruffell Signed-off-by: Russ Meyerriecks --- drivers/dahdi/wct4xxp/base.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 338771d..20432a5 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -1121,16 +1121,11 @@ static int t4_echocan_create(struct dahdi_chan *chan, struct t4 *wc = chan->pvt; struct t4_span *tspan = container_of(chan->span, struct t4_span, span); int channel; - const struct dahdi_echocan_ops *ops; - const struct dahdi_echocan_features *features; const bool alaw = (chan->span->deflaw == 2); if (!vpmsupport || !wc->vpm) return -ENODEV; - ops = &vpm_ec_ops; - features = &vpm_ec_features; - if (ecp->param_count > 0) { dev_warn(&wc->dev->dev, "%s echo canceller does not support " "parameters; failing request\n", @@ -1139,8 +1134,8 @@ static int t4_echocan_create(struct dahdi_chan *chan, } *ec = tspan->ec[chan->chanpos - 1]; - (*ec)->ops = ops; - (*ec)->features = *features; + (*ec)->ops = &vpm_ec_ops; + (*ec)->features = vpm_ec_features; channel = has_e1_span(wc) ? chan->chanpos : chan->chanpos + 4;