*: Change thread->func to return void instead of int

The int return value is never used.  Modify the code
base to just return a void instead.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

17 files changed, 59 insertions, 89 deletions

diff --git a/isisd/fabricd.c b/isisd/fabricd.c
index 2937df992..3e0d4ba54 100644
--- a/isisd/fabricd.c
+++ b/isisd/fabricd.c
@@ -250,7 +250,7 @@ void fabricd_finish(struct fabricd *f)
 	hash_free(f->neighbors_neighbors);
 }
 
-static int fabricd_initial_sync_timeout(struct thread *thread)
+static void fabricd_initial_sync_timeout(struct thread *thread)
 {
 	struct fabricd *f = THREAD_ARG(thread);
 
@@ -258,7 +258,6 @@ static int fabricd_initial_sync_timeout(struct thread *thread)
 		  f->initial_sync_circuit->interface->name);
 	f->initial_sync_state = FABRICD_SYNC_PENDING;
 	f->initial_sync_circuit = NULL;
-	return 0;
 }
 
 void fabricd_initial_sync_hello(struct isis_circuit *circuit)
@@ -399,22 +398,21 @@ static uint8_t fabricd_calculate_fabric_tier(struct isis_area *area)
 	return tier;
 }
 
-static int fabricd_tier_set_timer(struct thread *thread)
+static void fabricd_tier_set_timer(struct thread *thread)
 {
 	struct fabricd *f = THREAD_ARG(thread);
 
 	fabricd_set_tier(f, f->tier_pending);
-	return 0;
 }
 
-static int fabricd_tier_calculation_cb(struct thread *thread)
+static void fabricd_tier_calculation_cb(struct thread *thread)
 {
 	struct fabricd *f = THREAD_ARG(thread);
 	uint8_t tier = ISIS_TIER_UNDEFINED;
 
 	tier = fabricd_calculate_fabric_tier(f->area);
 	if (tier == ISIS_TIER_UNDEFINED)
-		return 0;
+		return;
 
 	zlog_info("OpenFabric: Got tier %hhu from algorithm. Arming timer.",
 		  tier);
@@ -423,7 +421,6 @@ static int fabricd_tier_calculation_cb(struct thread *thread)
 			 f->area->lsp_gen_interval[ISIS_LEVEL2 - 1],
 			 &f->tier_set_timer);
 
-	return 0;
 }
 
 static void fabricd_bump_tier_calculation_timer(struct fabricd *f)
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index d75613f30..06909c430 100644
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -448,7 +448,7 @@ const char *isis_adj_yang_state(enum isis_adj_state state)
 	}
 }
 
-int isis_adj_expire(struct thread *thread)
+void isis_adj_expire(struct thread *thread)
 {
 	struct isis_adjacency *adj;
 
@@ -461,8 +461,6 @@ int isis_adj_expire(struct thread *thread)
 
 	/* trigger the adj expire event */
 	isis_adj_state_change(&adj, ISIS_ADJ_DOWN, "holding time expired");
-
-	return 0;
 }
 
 /*
diff --git a/isisd/isis_adjacency.h b/isisd/isis_adjacency.h
index af70775a8..4d84c5ca4 100644
--- a/isisd/isis_adjacency.h
+++ b/isisd/isis_adjacency.h
@@ -141,13 +141,13 @@ void isis_adj_state_change(struct isis_adjacency **adj,
 			   enum isis_adj_state state, const char *reason);
 void isis_adj_print(struct isis_adjacency *adj);
 const char *isis_adj_yang_state(enum isis_adj_state state);
-int isis_adj_expire(struct thread *thread);
+void isis_adj_expire(struct thread *thread);
 void isis_adj_print_vty(struct isis_adjacency *adj, struct vty *vty,
 			char detail);
 void isis_adj_build_neigh_list(struct list *adjdb, struct list *list);
 void isis_adj_build_up_list(struct list *adjdb, struct list *list);
 int isis_adj_usage2levels(enum isis_adj_usage usage);
-int isis_bfd_startup_timer(struct thread *thread);
+void isis_bfd_startup_timer(struct thread *thread);
 const char *isis_adj_name(const struct isis_adjacency *adj);
 
 #endif /* ISIS_ADJACENCY_H */
diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c
index e09e23aae..78197974d 100644
--- a/isisd/isis_dr.c
+++ b/isisd/isis_dr.c
@@ -61,7 +61,7 @@ const char *isis_disflag2string(int disflag)
 	return NULL; /* not reached */
 }
 
-int isis_run_dr(struct thread *thread)
+void isis_run_dr(struct thread *thread)
 {
 	struct isis_circuit_arg *arg = THREAD_ARG(thread);
 
@@ -76,7 +76,7 @@ int isis_run_dr(struct thread *thread)
 		zlog_warn("%s: scheduled for non broadcast circuit from %s:%d",
 			  __func__, thread->xref->xref.file,
 			  thread->xref->xref.line);
-		return ISIS_WARNING;
+		return;
 	}
 
 	if (circuit->u.bc.run_dr_elect[level - 1])
@@ -84,8 +84,6 @@ int isis_run_dr(struct thread *thread)
 
 	circuit->u.bc.t_run_dr[level - 1] = NULL;
 	circuit->u.bc.run_dr_elect[level - 1] = 1;
-
-	return ISIS_OK;
 }
 
 static int isis_check_dr_change(struct isis_adjacency *adj, int level)
diff --git a/isisd/isis_dr.h b/isisd/isis_dr.h
index 5cab985d4..f01a03f37 100644
--- a/isisd/isis_dr.h
+++ b/isisd/isis_dr.h
@@ -24,7 +24,7 @@
 #ifndef _ZEBRA_ISIS_DR_H
 #define _ZEBRA_ISIS_DR_H
 
-int isis_run_dr(struct thread *thread);
+void isis_run_dr(struct thread *thread);
 int isis_dr_elect(struct isis_circuit *circuit, int level);
 int isis_dr_resign(struct isis_circuit *circuit, int level);
 int isis_dr_commence(struct isis_circuit *circuit, int level);
diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c
index ade6e8222..8d76e8193 100644
--- a/isisd/isis_dynhn.c
+++ b/isisd/isis_dynhn.c
@@ -42,7 +42,7 @@
 
 DEFINE_MTYPE_STATIC(ISISD, ISIS_DYNHN, "ISIS dyn hostname");
 
-static int dyn_cache_cleanup(struct thread *);
+static void dyn_cache_cleanup(struct thread *);
 
 void dyn_cache_init(struct isis *isis)
 {
@@ -67,7 +67,7 @@ void dyn_cache_finish(struct isis *isis)
 	list_delete(&isis->dyn_cache);
 }
 
-static int dyn_cache_cleanup(struct thread *thread)
+static void dyn_cache_cleanup(struct thread *thread)
 {
 	struct listnode *node, *nnode;
 	struct isis_dynhn *dyn;
@@ -87,8 +87,6 @@ static int dyn_cache_cleanup(struct thread *thread)
 
 	thread_add_timer(master, dyn_cache_cleanup, isis, 120,
 			&isis->t_dync_clean);
-
-	return ISIS_OK;
 }
 
 struct isis_dynhn *dynhn_find_by_id(struct isis *isis, const uint8_t *id)
diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index 26c68db76..fce48fec9 100644
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -209,7 +209,7 @@ void isis_circuit_is_type_set(struct isis_circuit *circuit, int newtype)
 
 /* events supporting code */
 
-int isis_event_dis_status_change(struct thread *thread)
+void isis_event_dis_status_change(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 
@@ -217,15 +217,13 @@ int isis_event_dis_status_change(struct thread *thread)
 
 	/* invalid arguments */
 	if (!circuit || !circuit->area)
-		return 0;
+		return;
 	if (IS_DEBUG_EVENTS)
 		zlog_debug("ISIS-Evt (%s) DIS status change",
 			   circuit->area->area_tag);
 
 	/* LSP generation again */
 	lsp_regenerate_schedule(circuit->area, IS_LEVEL_1 | IS_LEVEL_2, 0);
-
-	return 0;
 }
 
 void isis_event_auth_failure(char *area_tag, const char *error_string,
diff --git a/isisd/isis_events.h b/isisd/isis_events.h
index 25643f4ed..e6d9af58b 100644
--- a/isisd/isis_events.h
+++ b/isisd/isis_events.h
@@ -31,7 +31,7 @@ void isis_event_circuit_type_change(struct isis_circuit *circuit, int newtype);
 /*
  * Events related to adjacencies
  */
-int isis_event_dis_status_change(struct thread *thread);
+void isis_event_dis_status_change(struct thread *thread);
 
 /*
  * Error events
diff --git a/isisd/isis_ldp_sync.c b/isisd/isis_ldp_sync.c
index 0c541348d..3c68b8d15 100644
--- a/isisd/isis_ldp_sync.c
+++ b/isisd/isis_ldp_sync.c
@@ -344,7 +344,7 @@ void isis_ldp_sync_set_if_metric(struct isis_circuit *circuit, bool run_regen)
 /*
  * LDP-SYNC holddown timer routines
  */
-static int isis_ldp_sync_holddown_timer(struct thread *thread)
+static void isis_ldp_sync_holddown_timer(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 	struct ldp_sync_info *ldp_sync_info;
@@ -355,7 +355,7 @@ static int isis_ldp_sync_holddown_timer(struct thread *thread)
 	 */
 	circuit = THREAD_ARG(thread);
 	if (circuit->ldp_sync_info == NULL)
-		return 0;
+		return;
 
 	ldp_sync_info = circuit->ldp_sync_info;
 
@@ -366,7 +366,6 @@ static int isis_ldp_sync_holddown_timer(struct thread *thread)
 		  circuit->interface->name);
 
 	isis_ldp_sync_set_if_metric(circuit, true);
-	return 0;
 }
 
 void isis_ldp_sync_holddown_timer_add(struct isis_circuit *circuit)
diff --git a/isisd/isis_lfa.c b/isisd/isis_lfa.c
index 84aac24d5..d515873ec 100644
--- a/isisd/isis_lfa.c
+++ b/isisd/isis_lfa.c
@@ -1401,7 +1401,7 @@ static struct rlfa *rlfa_lookup(struct isis_spftree *spftree,
 	return rlfa_tree_find(&spftree->lfa.remote.rlfas, &s);
 }
 
-static int isis_area_verify_routes_cb(struct thread *thread)
+static void isis_area_verify_routes_cb(struct thread *thread)
 {
 	struct isis_area *area = THREAD_ARG(thread);
 
@@ -1409,8 +1409,6 @@ static int isis_area_verify_routes_cb(struct thread *thread)
 		zlog_debug("ISIS-LFA: updating RLFAs in the RIB");
 
 	isis_area_verify_routes(area);
-
-	return 0;
 }
 
 static mpls_label_t rlfa_nexthop_label(struct isis_spftree *spftree,
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 92d329f03..463d26f6c 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -62,9 +62,9 @@
 
 DEFINE_MTYPE_STATIC(ISISD, ISIS_LSP, "ISIS LSP");
 
-static int lsp_refresh(struct thread *thread);
-static int lsp_l1_refresh_pseudo(struct thread *thread);
-static int lsp_l2_refresh_pseudo(struct thread *thread);
+static void lsp_refresh(struct thread *thread);
+static void lsp_l1_refresh_pseudo(struct thread *thread);
+static void lsp_l2_refresh_pseudo(struct thread *thread);
 
 static void lsp_destroy(struct isis_lsp *lsp);
 
@@ -1447,7 +1447,7 @@ static int lsp_regenerate(struct isis_area *area, int level)
 /*
  * Something has changed or periodic refresh -> regenerate LSP
  */
-static int lsp_refresh(struct thread *thread)
+static void lsp_refresh(struct thread *thread)
 {
 	struct lsp_refresh_arg *arg = THREAD_ARG(thread);
 
@@ -1463,7 +1463,7 @@ static int lsp_refresh(struct thread *thread)
 	area->lsp_regenerate_pending[level - 1] = 0;
 
 	if ((area->is_type & level) == 0)
-		return ISIS_ERROR;
+		return;
 
 	/*
 	 * Throttle regeneration of LSPs (but not when BFD signalled a 'down'
@@ -1476,13 +1476,13 @@ static int lsp_refresh(struct thread *thread)
 			    area->area_tag, level);
 		_lsp_regenerate_schedule(area, level, 0, false,
 					 __func__, __FILE__, __LINE__);
-		return 0;
+		return;
 	}
 
 	sched_debug(
 		"ISIS (%s): LSP L%d refresh timer expired. Refreshing LSP...",
 		area->area_tag, level);
-	return lsp_regenerate(area, level);
+	lsp_regenerate(area, level);
 }
 
 int _lsp_regenerate_schedule(struct isis_area *area, int level,
@@ -1827,7 +1827,7 @@ static int lsp_regenerate_pseudo(struct isis_circuit *circuit, int level)
 /*
  * Something has changed or periodic refresh -> regenerate pseudo LSP
  */
-static int lsp_l1_refresh_pseudo(struct thread *thread)
+static void lsp_l1_refresh_pseudo(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 	uint8_t id[ISIS_SYS_ID_LEN + 2];
@@ -1843,13 +1843,13 @@ static int lsp_l1_refresh_pseudo(struct thread *thread)
 		LSP_PSEUDO_ID(id) = circuit->circuit_id;
 		LSP_FRAGMENT(id) = 0;
 		lsp_purge_pseudo(id, circuit, IS_LEVEL_1);
-		return ISIS_ERROR;
+		return;
 	}
 
-	return lsp_regenerate_pseudo(circuit, IS_LEVEL_1);
+	lsp_regenerate_pseudo(circuit, IS_LEVEL_1);
 }
 
-static int lsp_l2_refresh_pseudo(struct thread *thread)
+static void lsp_l2_refresh_pseudo(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 	uint8_t id[ISIS_SYS_ID_LEN + 2];
@@ -1865,10 +1865,10 @@ static int lsp_l2_refresh_pseudo(struct thread *thread)
 		LSP_PSEUDO_ID(id) = circuit->circuit_id;
 		LSP_FRAGMENT(id) = 0;
 		lsp_purge_pseudo(id, circuit, IS_LEVEL_2);
-		return ISIS_ERROR;
+		return;
 	}
 
-	return lsp_regenerate_pseudo(circuit, IS_LEVEL_2);
+	lsp_regenerate_pseudo(circuit, IS_LEVEL_2);
 }
 
 int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level)
@@ -1973,7 +1973,7 @@ int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level)
  * Walk through LSPs for an area
  *  - set remaining lifetime
  */
-int lsp_tick(struct thread *thread)
+void lsp_tick(struct thread *thread)
 {
 	struct isis_area *area;
 	struct isis_lsp *lsp;
@@ -2064,8 +2064,6 @@ int lsp_tick(struct thread *thread)
 	    && !isis_tx_queue_len(fabricd_init_c->tx_queue)) {
 		fabricd_initial_sync_finish(area);
 	}
-
-	return ISIS_OK;
 }
 
 void lsp_purge_pseudo(uint8_t *id, struct isis_circuit *circuit, int level)
diff --git a/isisd/isis_lsp.h b/isisd/isis_lsp.h
index cac5f0d73..f42d702b3 100644
--- a/isisd/isis_lsp.h
+++ b/isisd/isis_lsp.h
@@ -65,7 +65,7 @@ DECLARE_RBTREE_UNIQ(lspdb, struct isis_lsp, dbe, lspdb_compare);
 
 void lsp_db_init(struct lspdb_head *head);
 void lsp_db_fini(struct lspdb_head *head);
-int lsp_tick(struct thread *thread);
+void lsp_tick(struct thread *thread);
 
 int lsp_generate(struct isis_area *area, int level);
 #define lsp_regenerate_schedule(area, level, all_pseudo) \
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index 0814f3eea..517c9ec5a 100644
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -1793,11 +1793,10 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
 	return retval;
 }
 
-int isis_receive(struct thread *thread)
+void isis_receive(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 	uint8_t ssnpa[ETH_ALEN];
-	int retval;
 
 	/*
 	 * Get the circuit
@@ -1809,20 +1808,22 @@ int isis_receive(struct thread *thread)
 
 	isis_circuit_stream(circuit, &circuit->rcv_stream);
 
+#if ISIS_METHOD != ISIS_METHOD_BPF
+	int retval;
+
 	retval = circuit->rx(circuit, ssnpa);
 
-#if ISIS_METHOD != ISIS_METHOD_BPF
 	if (retval == ISIS_OK)
-		retval = isis_handle_pdu(circuit, ssnpa);
-#endif //ISIS_METHOD != ISIS_METHOD_BPF
+		isis_handle_pdu(circuit, ssnpa);
+#else // ISIS_METHOD != ISIS_METHOD_BPF
+	circuit->rx(circuit, ssnpa);
+#endif
 
 	/*
 	 * prepare for next packet.
 	 */
 	if (!circuit->is_passive)
 		isis_circuit_prepare(circuit);
-
-	return retval;
 }
 
 /*
@@ -2015,7 +2016,7 @@ int send_hello(struct isis_circuit *circuit, int level)
 	return retval;
 }
 
-static int send_hello_cb(struct thread *thread)
+static void send_hello_cb(struct thread *thread)
 {
 	struct isis_circuit_arg *arg = THREAD_ARG(thread);
 	assert(arg);
@@ -2030,30 +2031,29 @@ static int send_hello_cb(struct thread *thread)
 		send_hello(circuit, 1);
 		send_hello_sched(circuit, ISIS_LEVEL1,
 				 1000 * circuit->hello_interval[1]);
-		return ISIS_OK;
+		return;
 	}
 
 	if (circuit->circ_type != CIRCUIT_T_BROADCAST) {
 		zlog_warn("ISIS-Hello (%s): Trying to send hello on unknown circuit type %d",
 			  circuit->area->area_tag, circuit->circ_type);
-		return ISIS_WARNING;
+		return;
 	}
 
 	circuit->u.bc.t_send_lan_hello[level - 1] = NULL;
 	if (!(circuit->is_type & level)) {
 		zlog_warn("ISIS-Hello (%s): Trying to send L%d IIH in L%d-only circuit",
 			  circuit->area->area_tag, level, 3 - level);
-		return ISIS_WARNING;
+		return;
 	}
 
 	if (circuit->u.bc.run_dr_elect[level - 1])
 		isis_dr_elect(circuit, level);
 
-	int rv = send_hello(circuit, level);
+	send_hello(circuit, level);
 
 	/* set next timer thread */
 	send_hello_sched(circuit, level, 1000 * circuit->hello_interval[level - 1]);
-	return rv;
 }
 
 static void _send_hello_sched(struct isis_circuit *circuit,
@@ -2247,7 +2247,7 @@ int send_csnp(struct isis_circuit *circuit, int level)
 	return ISIS_OK;
 }
 
-int send_l1_csnp(struct thread *thread)
+void send_l1_csnp(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 
@@ -2265,11 +2265,9 @@ int send_l1_csnp(struct thread *thread)
 	thread_add_timer(master, send_l1_csnp, circuit,
 			 isis_jitter(circuit->csnp_interval[0], CSNP_JITTER),
 			 &circuit->t_send_csnp[0]);
-
-	return ISIS_OK;
 }
 
-int send_l2_csnp(struct thread *thread)
+void send_l2_csnp(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 
@@ -2287,8 +2285,6 @@ int send_l2_csnp(struct thread *thread)
 	thread_add_timer(master, send_l2_csnp, circuit,
 			 isis_jitter(circuit->csnp_interval[1], CSNP_JITTER),
 			 &circuit->t_send_csnp[1]);
-
-	return ISIS_OK;
 }
 
 /*
@@ -2405,7 +2401,7 @@ static int send_psnp(int level, struct isis_circuit *circuit)
 	return ISIS_OK;
 }
 
-int send_l1_psnp(struct thread *thread)
+void send_l1_psnp(struct thread *thread)
 {
 
 	struct isis_circuit *circuit;
@@ -2420,15 +2416,13 @@ int send_l1_psnp(struct thread *thread)
 	thread_add_timer(master, send_l1_psnp, circuit,
 			 isis_jitter(circuit->psnp_interval[0], PSNP_JITTER),
 			 &circuit->t_send_psnp[0]);
-
-	return ISIS_OK;
 }
 
 /*
  *  7.3.15.4 action on expiration of partial SNP interval
  *  level 2
  */
-int send_l2_psnp(struct thread *thread)
+void send_l2_psnp(struct thread *thread)
 {
 	struct isis_circuit *circuit;
 
@@ -2443,8 +2437,6 @@ int send_l2_psnp(struct thread *thread)
 	thread_add_timer(master, send_l2_psnp, circuit,
 			 isis_jitter(circuit->psnp_interval[1], PSNP_JITTER),
 			 &circuit->t_send_psnp[1]);
-
-	return ISIS_OK;
 }
 
 /*
diff --git a/isisd/isis_pdu.h b/isisd/isis_pdu.h
index 1e70a42f1..b2e43781f 100644
--- a/isisd/isis_pdu.h
+++ b/isisd/isis_pdu.h
@@ -195,7 +195,7 @@ struct isis_partial_seqnum_hdr {
 /*
  * Function for receiving IS-IS PDUs
  */
-int isis_receive(struct thread *thread);
+void isis_receive(struct thread *thread);
 
 /*
  * calling arguments for snp_process ()
@@ -210,10 +210,10 @@ int isis_receive(struct thread *thread);
  */
 void send_hello_sched(struct isis_circuit *circuit, int level, long delay);
 int send_csnp(struct isis_circuit *circuit, int level);
-int send_l1_csnp(struct thread *thread);
-int send_l2_csnp(struct thread *thread);
-int send_l1_psnp(struct thread *thread);
-int send_l2_psnp(struct thread *thread);
+void send_l1_csnp(struct thread *thread);
+void send_l2_csnp(struct thread *thread);
+void send_l1_psnp(struct thread *thread);
+void send_l2_psnp(struct thread *thread);
 void send_lsp(struct isis_circuit *circuit,
 	      struct isis_lsp *lsp, enum isis_tx_type tx_type);
 void fill_fixed_hdr(uint8_t pdu_type, struct stream *stream);
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 5718b48b9..04b5cf1a6 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -1832,7 +1832,7 @@ void isis_spf_invalidate_routes(struct isis_spftree *tree)
 	tree->route_table_backup->cleanup = isis_route_node_cleanup;
 }
 
-static int isis_run_spf_cb(struct thread *thread)
+static void isis_run_spf_cb(struct thread *thread)
 {
 	struct isis_spf_run *run = THREAD_ARG(thread);
 	struct isis_area *area = run->area;
@@ -1845,7 +1845,7 @@ static int isis_run_spf_cb(struct thread *thread)
 		if (IS_DEBUG_SPF_EVENTS)
 			zlog_warn("ISIS-SPF (%s) area does not share level",
 				  area->area_tag);
-		return ISIS_WARNING;
+		return;
 	}
 
 	isis_area_delete_backup_adj_sids(area, level);
@@ -1883,8 +1883,6 @@ static int isis_run_spf_cb(struct thread *thread)
 		UNSET_FLAG(circuit->flags, ISIS_CIRCUIT_FLAPPED_AFTER_SPF);
 
 	fabricd_run_spf(area);
-
-	return 0;
 }
 
 static struct isis_spf_run *isis_run_spf_arg(struct isis_area *area, int level)
diff --git a/isisd/isis_sr.c b/isisd/isis_sr.c
index 18a727add..91886cbc3 100644
--- a/isisd/isis_sr.c
+++ b/isisd/isis_sr.c
@@ -1090,7 +1090,7 @@ DEFUN(show_sr_node, show_sr_node_cmd,
  *
  * @return		1 on success
  */
-static int sr_start_label_manager(struct thread *start)
+static void sr_start_label_manager(struct thread *start)
 {
 	struct isis_area *area;
 
@@ -1098,8 +1098,6 @@ static int sr_start_label_manager(struct thread *start)
 
 	/* re-attempt to start SR & Label Manager connection */
 	isis_sr_start(area);
-
-	return 1;
 }
 
 /**
diff --git a/isisd/isis_tx_queue.c b/isisd/isis_tx_queue.c
index d3da5b9d3..078329221 100644
--- a/isisd/isis_tx_queue.c
+++ b/isisd/isis_tx_queue.c
@@ -114,7 +114,7 @@ static struct isis_tx_queue_entry *tx_queue_find(struct isis_tx_queue *queue,
 	return hash_lookup(queue->hash, &e);
 }
 
-static int tx_queue_send_event(struct thread *thread)
+static void tx_queue_send_event(struct thread *thread)
 {
 	struct isis_tx_queue_entry *e = THREAD_ARG(thread);
 	struct isis_tx_queue *queue = e->queue;
@@ -128,8 +128,6 @@ static int tx_queue_send_event(struct thread *thread)
 
 	queue->send_event(queue->circuit, e->lsp, e->type);
 	/* Don't access e here anymore, send_event might have destroyed it */
-
-	return 0;
 }
 
 void _isis_tx_queue_add(struct isis_tx_queue *queue,