X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eventdev%2Frte_event_timer_adapter.c;h=79070d48401a8a9f50ec72246f9f3d71f4441475;hb=7c383daae0dd446468675676a8386360b2c81a67;hp=6eba6b44d7374d901834aa29accd3b6429d5db7a;hpb=6750b21bd6af85bce262e380f25098e2303000d9;p=dpdk.git

diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/librte_eventdev/rte_event_timer_adapter.c
index 6eba6b44d7..79070d4840 100644
--- a/lib/librte_eventdev/rte_event_timer_adapter.c
+++ b/lib/librte_eventdev/rte_event_timer_adapter.c
@@ -565,7 +565,7 @@ sw_event_timer_cb(struct rte_timer *tim, void *arg)
 		 * immediate expiry value, so that we process it again on the
 		 * next iteration.
 		 */
-		rte_timer_reset_sync(tim, SINGLE, 0, rte_lcore_id(),
+		rte_timer_reset_sync(tim, 0, SINGLE, rte_lcore_id(),
 				     sw_event_timer_cb, evtim);
 
 		sw_data->stats.evtim_retry_count++;
@@ -695,7 +695,7 @@ check_destination_event_queue(struct rte_event_timer *evtim,
 static int
 sw_event_timer_adapter_service_func(void *arg)
 {
-	int ret, i, num_msgs;
+	int i, num_msgs;
 	uint64_t cycles, opaque;
 	uint16_t nb_evs_flushed = 0;
 	uint16_t nb_evs_invalid = 0;
@@ -705,8 +705,6 @@ sw_event_timer_adapter_service_func(void *arg)
 	struct rte_timer *tim = NULL;
 	struct msg *msg, *msgs[NB_OBJS];
 
-	RTE_SET_USED(ret);
-
 	adapter = arg;
 	sw_data = adapter->data->adapter_priv;
 
@@ -720,6 +718,10 @@ sw_event_timer_adapter_service_func(void *arg)
 						  (void **)msgs, NB_OBJS, NULL);
 
 		for (i = 0; i < num_msgs; i++) {
+			int ret = 0;
+
+			RTE_SET_USED(ret);
+
 			msg = msgs[i];
 			evtim = msg->evtim;
 
@@ -1280,9 +1282,7 @@ static const struct rte_event_timer_adapter_ops sw_event_adapter_timer_ops = {
 	.cancel_burst = sw_event_timer_cancel_burst,
 };
 
-RTE_INIT(event_timer_adapter_init_log);
-static void
-event_timer_adapter_init_log(void)
+RTE_INIT(event_timer_adapter_init_log)
 {
 	evtim_logtype = rte_log_register("lib.eventdev.adapter.timer");
 	if (evtim_logtype >= 0)