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

dahdi, xpp: dahdi_span_ops.sync_tick should return void.

Browse Source 
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
This commit is contained in:
Shaun Ruffell 2011-01-03 18:26:39 +00:00
parent c6ae6d6cec
commit 4763b89d5a
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dahdi/dahdi_dynamic.c
View File

@ -525,13 +525,13 @@ static int dahdi_dynamic_close(struct dahdi_chan *chan)
return 0; 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 *head;
struct dahdi_dynamic *d = dynamic_from_span(span); struct dahdi_dynamic *d = dynamic_from_span(span);
if (hasmaster) if (hasmaster)
return 0; return;
rcu_read_lock(); rcu_read_lock();
head = list_entry(dspan_list.next, struct dahdi_dynamic, list); 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) if (d == head)
dahdi_dynamic_run(); dahdi_dynamic_run();
return 0; return;
} }
static const struct dahdi_span_ops dynamic_ops = { static const struct dahdi_span_ops dynamic_ops = {

5
drivers/dahdi/xpp/xbus-pcm.c
View File

@ -494,7 +494,7 @@ static void global_tick(void)
} }
#ifdef DAHDI_SYNC_TICK #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); xpd_t *xpd = container_of(span, struct xpd, span);
static int redundant_ticks; /* for extra spans */ 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); xpp_ticker_step(&dahdi_ticker, &now);
dahdi_tick_count++; dahdi_tick_count++;
//flip_parport_bit(1); //flip_parport_bit(1);
return 0;
noop: noop:
return 0; /* No auto sync from dahdi */ return;
} }
#endif #endif

2
drivers/dahdi/xpp/xbus-pcm.h
View File

@ -120,7 +120,7 @@ void elect_syncer(const char *msg);
int exec_sync_command(const char *buf, size_t count); int exec_sync_command(const char *buf, size_t count);
int fill_sync_string(char *buf, size_t count); int fill_sync_string(char *buf, size_t count);
#ifdef DAHDI_SYNC_TICK #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 #endif
#ifdef DEBUG_PCMTX #ifdef DEBUG_PCMTX

2
include/dahdi/kernel.h
View File

@ -793,7 +793,7 @@ struct dahdi_span_ops {
#ifdef DAHDI_SYNC_TICK #ifdef DAHDI_SYNC_TICK
/*! Opt: send sync to spans. Called in hard_irq context with chan_lock /*! Opt: send sync to spans. Called in hard_irq context with chan_lock
* held.*/ * held.*/
int (*sync_tick)(struct dahdi_span *span, int is_master); void (*sync_tick)(struct dahdi_span *span, int is_master);
#endif #endif
/* ==== Channel Callback Operations ==== */ /* ==== Channel Callback Operations ==== */
/*! Opt: Set signalling type (if appropriate) */ /*! Opt: Set signalling type (if appropriate) */