From db5ce0faef41095d4fbf9804031931f8e886b2a1 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Wed, 8 Sep 2010 13:34:58 +0300 Subject: remove 'pvt' member of dahdi_span r8984 removed the member 'pvt' of struct dahdi_span in dahdi/kernel.h . No use to have a pointer to a struct that is already embedded in our struct. Thus we remove a single usage of it and replace it with container_of(). --- drivers/dahdi/wcopenpci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/dahdi/wcopenpci.c') diff --git a/drivers/dahdi/wcopenpci.c b/drivers/dahdi/wcopenpci.c index b28cac4..9e28279 100644 --- a/drivers/dahdi/wcopenpci.c +++ b/drivers/dahdi/wcopenpci.c @@ -1158,10 +1158,14 @@ static int openpci_open(struct dahdi_chan *chan) return 0; } +static inline struct openpci* openpci_from_span(struct dahdi_span *span) { + return container_of(span, struct openpci, span); +} + static int openpci_watchdog(struct dahdi_span *span, int event) { info("TDM: Restarting DMA"); - restart_dma(span->pvt); + restart_dma(openpci_from_span(span)); return 0; } @@ -1321,7 +1325,6 @@ static int span_initialize(struct openpci *wc) wc->span.watchdog = openpci_watchdog; init_waitqueue_head(&wc->span.maintq); - wc->span.pvt = wc; if (dahdi_register(&wc->span, 0)) { cardcrit(wc->boardnum, "Unable to register span with dahdi"); return RET_FAIL; -- cgit v1.2.3