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 | 5fd3fdc1cea7af8b1c46bbf2a5edd0c6fe2d3e54 (patch) | |
| tree | 384ce57c53c650294c490cda43b5ea7e624685cc /drivers/dahdi/xpp/card_pri.c | |
| parent | 1252d17c7d47bba0301ada32c0705fc9698d3c8d (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/xpp/card_pri.c')
| -rw-r--r-- | drivers/dahdi/xpp/card_pri.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index c869fd8..53cd8d5 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -1093,7 +1093,7 @@ bad_lineconfig: static int pri_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) { - xpd_t *xpd = span->pvt; + xpd_t *xpd = container_of(span, struct xpd, span); struct PRI_priv_data *priv; int ret; @@ -1127,10 +1127,9 @@ static int pri_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) */ static int pri_chanconfig(struct dahdi_chan *chan, int sigtype) { - xpd_t *xpd; + xpd_t *xpd = container_of(chan->span, struct xpd, span); struct PRI_priv_data *priv; - xpd = chan->span->pvt; BUG_ON(!xpd); priv = xpd->priv; DBG(GENERAL, "channel %d (%s) -> %s\n", chan->channo, chan->name, sig2str(sigtype)); @@ -1510,7 +1509,7 @@ static int PRI_card_close(xpd_t *xpd, lineno_t pos) */ static int pri_startup(struct dahdi_span *span) { - xpd_t *xpd = span->pvt; + xpd_t *xpd = container_of(span, struct xpd, span); struct PRI_priv_data *priv; BUG_ON(!xpd); @@ -1533,7 +1532,7 @@ static int pri_startup(struct dahdi_span *span) */ static int pri_shutdown(struct dahdi_span *span) { - xpd_t *xpd = span->pvt; + xpd_t *xpd = container_of(span, struct xpd, span); struct PRI_priv_data *priv; BUG_ON(!xpd); |