summaryrefslogtreecommitdiff
path: root/drivers/dahdi/xpp
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-01-03 18:26:39 +0000
committerShaun Ruffell <sruffell@digium.com>2011-01-03 18:26:39 +0000
commitb3ffd1e0e2b4f9e8f3d51aa45767af31ba253a87 (patch)
tree1f1a1d72301b9ebdad524b963a664cde42319c4f /drivers/dahdi/xpp
parentbd698c510843caf1e8d3644c0ac0ec5e6b407d67 (diff)
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@digium.com> Acked-by: Kinsey Moore <kmoore@digium.com> Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9587 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp')
-rw-r--r--drivers/dahdi/xpp/xbus-pcm.c5
-rw-r--r--drivers/dahdi/xpp/xbus-pcm.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dahdi/xpp/xbus-pcm.c b/drivers/dahdi/xpp/xbus-pcm.c
index cad61fb..ccd28ee 100644
--- a/drivers/dahdi/xpp/xbus-pcm.c
+++ b/drivers/dahdi/xpp/xbus-pcm.c
@@ -494,7 +494,7 @@ static void global_tick(void)
}
#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 @@ int dahdi_sync_tick(struct dahdi_span *span, int is_master)
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
diff --git a/drivers/dahdi/xpp/xbus-pcm.h b/drivers/dahdi/xpp/xbus-pcm.h
index 37a1ce4..de2a829 100644
--- a/drivers/dahdi/xpp/xbus-pcm.h
+++ b/drivers/dahdi/xpp/xbus-pcm.h
@@ -120,7 +120,7 @@ void elect_syncer(const char *msg);
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