FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi_dynamic_[loc|eth|ethmf]: Remove unused return value from transmit callback.

Browse Source 
The return value from the transmit callback function was not used
anywhere, and is now removed.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9570 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-01-03 18:25:18 +00:00
parent c7ae773800
commit 7251a7e35a
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dahdi/dahdi_dynamic_eth.c
View File

@ -140,7 +140,7 @@ static int ztdeth_notifier(struct notifier_block *block, unsigned long event, vo
return 0; 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 ztdeth *z;
struct sk_buff *skb; struct sk_buff *skb;
@ -189,7 +189,6 @@ static int ztdeth_transmit(void *pvt, unsigned char *msg, int msglen)
} }
else else
spin_unlock_irqrestore(&zlock, flags); spin_unlock_irqrestore(&zlock, flags);
return 0;
} }

10
drivers/dahdi/dahdi_dynamic_ethmf.c
View File

@ -388,7 +388,7 @@ static int ztdethmf_notifier(struct notifier_block *block, unsigned long event,
return 0; 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 ztdeth *z = pvt, *ready_spans[ETHMF_MAX_PER_SPAN_GROUP];
struct sk_buff *skb; struct sk_buff *skb;
@ -402,13 +402,13 @@ static int ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen)
#endif #endif
if (atomic_read(&shutdown)) if (atomic_read(&shutdown))
return 0; return;
rcu_read_lock(); rcu_read_lock();
if (unlikely(!z || !z->dev)) { if (unlikely(!z || !z->dev)) {
rcu_read_unlock(); rcu_read_unlock();
return 0; return;
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10) #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)) { if (unlikely(!skb)) {
rcu_read_unlock(); rcu_read_unlock();
ethmf_errors_inc(); ethmf_errors_inc();
return 0; return;
} }
/* Reserve header space */ /* Reserve header space */
@ -534,7 +534,7 @@ static int ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen)
rcu_read_unlock(); rcu_read_unlock();
return 0; return;
} }
static int ztdethmf_flush(void) static int ztdethmf_flush(void)

3
drivers/dahdi/dahdi_dynamic_loc.c
View File

@ -75,7 +75,7 @@ struct dahdi_dynamic_local {
static DEFINE_SPINLOCK(local_lock); static DEFINE_SPINLOCK(local_lock);
static LIST_HEAD(dynamic_local_list); static LIST_HEAD(dynamic_local_list);
static int static void
dahdi_dynamic_local_transmit(void *pvt, unsigned char *msg, int msglen) dahdi_dynamic_local_transmit(void *pvt, unsigned char *msg, int msglen)
{ {
struct dahdi_dynamic_local *const d = pvt; 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); spin_unlock_irqrestore(&local_lock, flags);
return 0;
} }
static int digit2int(char d) static int digit2int(char d)

2
include/dahdi/kernel.h
View File

@ -1000,7 +1000,7 @@ struct dahdi_dynamic_driver {
void (*destroy)(void *tpipe); void (*destroy)(void *tpipe);
/*! Transmit a given message */ /*! 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 */ /*! Flush any pending messages */
int (*flush)(void); int (*flush)(void);