[svn-commits] sruffell: linux/trunk r9587 - in /linux/trunk: drivers/dahdi/ drivers/dahdi/x...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Jan  3 12:26:39 2011
New Revision: 9587

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9587
Log:
dahdi, xpp: dahdi_span_ops.sync_tick should return void.

Since the return value is not defined/used just return void.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi_dynamic.c
    linux/trunk/drivers/dahdi/xpp/xbus-pcm.c
    linux/trunk/drivers/dahdi/xpp/xbus-pcm.h
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/dahdi_dynamic.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_dynamic.c?view=diff&rev=9587&r1=9586&r2=9587
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dynamic.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dynamic.c Mon Jan  3 12:26:39 2011
@@ -525,13 +525,13 @@
 	return 0;
 }
 
-static int dahdi_dynamic_sync_tick(struct dahdi_span *span, int is_master)
+static void dahdi_dynamic_sync_tick(struct dahdi_span *span, int is_master)
 {
 	struct dahdi_dynamic *head;
 	struct dahdi_dynamic *d = dynamic_from_span(span);
 
 	if (hasmaster)
-		return 0;
+		return;
 
 	rcu_read_lock();
 	head = list_entry(dspan_list.next, struct dahdi_dynamic, list);
@@ -539,7 +539,7 @@
 
 	if (d == head)
 		dahdi_dynamic_run();
-	return 0;
+	return;
 }
 
 static const struct dahdi_span_ops dynamic_ops = {

Modified: linux/trunk/drivers/dahdi/xpp/xbus-pcm.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-pcm.c?view=diff&rev=9587&r1=9586&r2=9587
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-pcm.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-pcm.c Mon Jan  3 12:26:39 2011
@@ -494,7 +494,7 @@
 }
 
 #ifdef	DAHDI_SYNC_TICK
-int dahdi_sync_tick(struct dahdi_span *span, int is_master)
+void dahdi_sync_tick(struct dahdi_span *span, int is_master)
 {
 	xpd_t		*xpd = container_of(span, struct xpd, span);
 	static int	redundant_ticks;	/* for extra spans */
@@ -536,9 +536,8 @@
 	xpp_ticker_step(&dahdi_ticker, &now);
 	dahdi_tick_count++;
 	//flip_parport_bit(1);
-	return 0;
 noop:
-	return 0;	/* No auto sync from dahdi */
+	return;
 }
 #endif
 

Modified: linux/trunk/drivers/dahdi/xpp/xbus-pcm.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-pcm.h?view=diff&rev=9587&r1=9586&r2=9587
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-pcm.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-pcm.h Mon Jan  3 12:26:39 2011
@@ -120,7 +120,7 @@
 int		exec_sync_command(const char *buf, size_t count);
 int		fill_sync_string(char *buf, size_t count);
 #ifdef	DAHDI_SYNC_TICK
-int		dahdi_sync_tick(struct dahdi_span *span, int is_master);
+void		dahdi_sync_tick(struct dahdi_span *span, int is_master);
 #endif
 
 #ifdef	DEBUG_PCMTX

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=9587&r1=9586&r2=9587
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Mon Jan  3 12:26:39 2011
@@ -793,7 +793,7 @@
 #ifdef	DAHDI_SYNC_TICK
 	/*! Opt: send sync to spans. Called in hard_irq context with chan_lock
 	 *       held.*/
-	int (*sync_tick)(struct dahdi_span *span, int is_master);
+	void (*sync_tick)(struct dahdi_span *span, int is_master);
 #endif
 	/* ====  Channel Callback Operations ==== */
 	/*! Opt: Set signalling type (if appropriate) */