From 8ac8b90bd4725df3a4b968eacb4f6fcb17d13c14 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 20 Oct 2010 12:22:47 +0000 Subject: [PATCH] wctc4xxp: Remove 'service_dte' function and a few inline keywords. 'service_dte' was only called in one place and is only two lines. I do not think it is adding much anymore. Also, let compiler should decide if 'service_rx_ring' and 'service_tx_ring' should be inlined. Signed-off-by: Shaun Ruffell Acked-by: Kinsey Moore Acked-by: Russ Meyerriecks git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9435 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctc4xxp/base.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index d5137b1..d2f6eef 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -2500,7 +2500,7 @@ wctc4xxp_receiveprep(struct wcdte *wc, struct tcb *cmd) } } -static inline void service_tx_ring(struct wcdte *wc) +static void service_tx_ring(struct wcdte *wc) { struct tcb *cmd; unsigned long flags; @@ -2541,7 +2541,7 @@ static inline void service_tx_ring(struct wcdte *wc) } } -static inline void service_rx_ring(struct wcdte *wc) +static void service_rx_ring(struct wcdte *wc) { struct tcb *cmd; unsigned long flags; @@ -2563,13 +2563,6 @@ static inline void service_rx_ring(struct wcdte *wc) wctc4xxp_receive_demand_poll(wc); } -static inline void service_dte(struct wcdte *wc) -{ - service_tx_ring(wc); - service_rx_ring(wc); -} - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) static void deferred_work_func(void *param) { @@ -2579,7 +2572,8 @@ static void deferred_work_func(struct work_struct *work) { struct wcdte *wc = container_of(work, struct wcdte, deferred_work); #endif - service_dte(wc); + service_tx_ring(wc); + service_rx_ring(wc); } DAHDI_IRQ_HANDLER(wctc4xxp_interrupt)