[svn-commits] sruffell: linux/trunk r9570 - in /linux/trunk: drivers/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Jan  3 12:25:18 2011
New Revision: 9570

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9570
Log:
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 <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi_dynamic_eth.c
    linux/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c
    linux/trunk/drivers/dahdi/dahdi_dynamic_loc.c
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/dahdi_dynamic_eth.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_dynamic_eth.c?view=diff&rev=9570&r1=9569&r2=9570
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dynamic_eth.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dynamic_eth.c Mon Jan  3 12:25:18 2011
@@ -140,7 +140,7 @@
 	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 @@
 	}
 	else
 		spin_unlock_irqrestore(&zlock, flags);
-	return 0;
 }
 
 

Modified: linux/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c?view=diff&rev=9570&r1=9569&r2=9570
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c Mon Jan  3 12:25:18 2011
@@ -388,7 +388,7 @@
 	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 @@
 #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 @@
 		if (unlikely(!skb)) {
 			rcu_read_unlock();
 			ethmf_errors_inc();
-			return 0;
+			return;
 		}
 
 		/* Reserve header space */
@@ -534,7 +534,7 @@
 
 	rcu_read_unlock();
 
-	return 0;
+	return;
 }
 
 static int ztdethmf_flush(void)

Modified: linux/trunk/drivers/dahdi/dahdi_dynamic_loc.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_dynamic_loc.c?view=diff&rev=9570&r1=9569&r2=9570
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dynamic_loc.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dynamic_loc.c Mon Jan  3 12:25:18 2011
@@ -75,7 +75,7 @@
 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 @@
 		}
 	}
 	spin_unlock_irqrestore(&local_lock, flags);
-	return 0;
 }
 
 static int digit2int(char d)

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=9570&r1=9569&r2=9570
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Mon Jan  3 12:25:18 2011
@@ -1000,7 +1000,7 @@
 	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);