From 7251a7e35a2435a70599428b3946ebc3a77c804b Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 3 Jan 2011 18:25:18 +0000 Subject: [PATCH] dahdi_dynamic_[loc|eth|ethmf]: Remove unused return value from transmit callback. The return value from the transmit callback function was not used anywhere, and is now removed. Signed-off-by: Shaun Ruffell Acked-by: Kinsey Moore git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9570 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi_dynamic_eth.c | 3 +-- drivers/dahdi/dahdi_dynamic_ethmf.c | 10 +++++----- drivers/dahdi/dahdi_dynamic_loc.c | 3 +-- include/dahdi/kernel.h | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/dahdi/dahdi_dynamic_eth.c b/drivers/dahdi/dahdi_dynamic_eth.c index 31566d6..c28bf20 100644 --- a/drivers/dahdi/dahdi_dynamic_eth.c +++ b/drivers/dahdi/dahdi_dynamic_eth.c @@ -140,7 +140,7 @@ static int ztdeth_notifier(struct notifier_block *block, unsigned long event, vo return 0; } -static int ztdeth_transmit(void *pvt, unsigned char *msg, int msglen) +static void ztdeth_transmit(void *pvt, unsigned char *msg, int msglen) { struct ztdeth *z; struct sk_buff *skb; @@ -189,7 +189,6 @@ static int ztdeth_transmit(void *pvt, unsigned char *msg, int msglen) } else spin_unlock_irqrestore(&zlock, flags); - return 0; } diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c index 126001f..8dfb464 100644 --- a/drivers/dahdi/dahdi_dynamic_ethmf.c +++ b/drivers/dahdi/dahdi_dynamic_ethmf.c @@ -388,7 +388,7 @@ static int ztdethmf_notifier(struct notifier_block *block, unsigned long event, return 0; } -static int ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen) +static void ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen) { struct ztdeth *z = pvt, *ready_spans[ETHMF_MAX_PER_SPAN_GROUP]; struct sk_buff *skb; @@ -402,13 +402,13 @@ static int ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen) #endif if (atomic_read(&shutdown)) - return 0; + return; rcu_read_lock(); if (unlikely(!z || !z->dev)) { rcu_read_unlock(); - return 0; + return; } #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10) @@ -464,7 +464,7 @@ static int ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen) if (unlikely(!skb)) { rcu_read_unlock(); ethmf_errors_inc(); - return 0; + return; } /* Reserve header space */ @@ -534,7 +534,7 @@ static int ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen) rcu_read_unlock(); - return 0; + return; } static int ztdethmf_flush(void) diff --git a/drivers/dahdi/dahdi_dynamic_loc.c b/drivers/dahdi/dahdi_dynamic_loc.c index e661ec9..3240311 100644 --- a/drivers/dahdi/dahdi_dynamic_loc.c +++ b/drivers/dahdi/dahdi_dynamic_loc.c @@ -75,7 +75,7 @@ struct dahdi_dynamic_local { static DEFINE_SPINLOCK(local_lock); static LIST_HEAD(dynamic_local_list); -static int +static void dahdi_dynamic_local_transmit(void *pvt, unsigned char *msg, int msglen) { struct dahdi_dynamic_local *const d = pvt; @@ -94,7 +94,6 @@ dahdi_dynamic_local_transmit(void *pvt, unsigned char *msg, int msglen) } } spin_unlock_irqrestore(&local_lock, flags); - return 0; } static int digit2int(char d) diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 72e9bae..26bce0b 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1000,7 +1000,7 @@ struct dahdi_dynamic_driver { void (*destroy)(void *tpipe); /*! Transmit a given message */ - int (*transmit)(void *tpipe, unsigned char *msg, int msglen); + void (*transmit)(void *tpipe, unsigned char *msg, int msglen); /*! Flush any pending messages */ int (*flush)(void);