From 0b499d9566a994f640dc1da03f4e4d8853af6d63 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 13 Jan 2014 12:58:36 -0600 Subject: [PATCH] wcte43x: 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/wcte43x-base.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/dahdi/wcte43x-base.c b/drivers/dahdi/wcte43x-base.c index aaae81a..056e113 100644 --- a/drivers/dahdi/wcte43x-base.c +++ b/drivers/dahdi/wcte43x-base.c @@ -648,16 +648,11 @@ static int t43x_echocan_create(struct dahdi_chan *chan, struct t43x *wc = chan->pvt; struct t43x_span *ts = container_of(chan->span, struct t43x_span, span); int channel = chan->chanpos - 1; - 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->xb.pdev->dev, "%s echo canceller does not support parameters; failing request\n", @@ -666,8 +661,8 @@ static int t43x_echocan_create(struct dahdi_chan *chan, } *ec = ts->ec[channel]; - (*ec)->ops = ops; - (*ec)->features = *features; + (*ec)->ops = &vpm_ec_ops; + (*ec)->features = vpm_ec_features; channel += (32*chan->span->offset); vpm450m_set_alaw_companding(wc->vpm, channel, alaw);