diff options
| -rw-r--r-- | drivers/dahdi/dahdi_dynamic.c | 6 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xbus-pcm.c | 5 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xbus-pcm.h | 2 | ||||
| -rw-r--r-- | include/dahdi/kernel.h | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index c1bba4e..942329a 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -525,13 +525,13 @@ static int dahdi_dynamic_close(struct dahdi_chan *chan) 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 @@ static int dahdi_dynamic_sync_tick(struct dahdi_span *span, int is_master) if (d == head) dahdi_dynamic_run(); - return 0; + return; } static const struct dahdi_span_ops dynamic_ops = { 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 diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index a1424c4..b6864ee 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -793,7 +793,7 @@ struct dahdi_span_ops { #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) */ |