diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-07-26 00:30:39 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-07-26 00:30:39 +0000 |
| commit | 8682c2a90bd996765326fb6477a2466b63530b73 (patch) | |
| tree | 384ce57c53c650294c490cda43b5ea7e624685cc /drivers/dahdi/wcb4xxp | |
| parent | 5c45b4da59502f5a30f3eb01e431d92d3d1c2202 (diff) | |
dahdi: Remove the 'pvt' member from dahdi_span.
The vast majority of board drivers already keep the dahdi_span structure
in a driver specific structure. The others were easily converted. This
way board drivers can use the container_of macro to find what was
previously pointed to by the "pvt" member of the span. One less thing
to think about in the span structure.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8984 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wcb4xxp')
| -rw-r--r-- | drivers/dahdi/wcb4xxp/base.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c index 3e159bb..a4ccaf4 100644 --- a/drivers/dahdi/wcb4xxp/base.c +++ b/drivers/dahdi/wcb4xxp/base.c @@ -2088,7 +2088,7 @@ static void b4xxp_update_leds(struct b4xxp *b4) static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec) { - struct b4xxp_span *bspan = chan->span->pvt; + struct b4xxp_span *bspan = container_of(chan->span, struct b4xxp_span, span); int channel; if (chan->chanpos == 3) { @@ -2117,7 +2117,7 @@ static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *e static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec) { - struct b4xxp_span *bspan = chan->span->pvt; + struct b4xxp_span *bspan = container_of(chan->span, struct b4xxp_span, span); int channel; memset(ec, 0, sizeof(*ec)); @@ -2145,7 +2145,7 @@ static int b4xxp_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long static int b4xxp_startup(struct dahdi_span *span) { - struct b4xxp_span *bspan = span->pvt; + struct b4xxp_span *bspan = container_of(span, struct b4xxp_span, span); struct b4xxp *b4 = bspan->parent; if (!b4->running) @@ -2156,7 +2156,7 @@ static int b4xxp_startup(struct dahdi_span *span) static int b4xxp_shutdown(struct dahdi_span *span) { - struct b4xxp_span *bspan = span->pvt; + struct b4xxp_span *bspan = container_of(span, struct b4xxp_span, span); hfc_disable_interrupts(bspan->parent); return 0; @@ -2179,7 +2179,7 @@ static void b4xxp_reset_span(struct b4xxp_span *bspan) static int b4xxp_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) { int i; - struct b4xxp_span *bspan = span->pvt; + struct b4xxp_span *bspan = container_of(span, struct b4xxp_span, span); struct b4xxp *b4 = bspan->parent; if (DBG) @@ -2322,7 +2322,6 @@ static void init_spans(struct b4xxp *b4) bspan->parent = b4; bspan->span.irq = b4->pdev->irq; - bspan->span.pvt = bspan; bspan->span.spantype = (bspan->te_mode) ? "TE" : "NT"; bspan->span.offset = i; bspan->span.channels = WCB4XXP_CHANNELS_PER_SPAN; |