X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fevent%2Fopdl%2Fopdl_evdev.c;h=9b2f75fe37f049d9ab9da5e779da0b073df33717;hb=7365a3cee51fb0a0535336f5a5da1c3d41ee256a;hp=dcbf404a35220e4ba2e401763e57e026c38a493b;hpb=d548ef513cd704a3681675e49519e31abace2d70;p=dpdk.git

diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c
index dcbf404a35..9b2f75fe37 100644
--- a/drivers/event/opdl/opdl_evdev.c
+++ b/drivers/event/opdl/opdl_evdev.c
@@ -1,6 +1,5 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 
 #include <inttypes.h>
@@ -103,7 +102,7 @@ opdl_port_link(struct rte_eventdev *dev,
 			     dev->data->dev_id,
 				queues[0],
 				p->id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
@@ -114,7 +113,7 @@ opdl_port_link(struct rte_eventdev *dev,
 			     dev->data->dev_id,
 				num,
 				p->id);
-		rte_errno = -EDQUOT;
+		rte_errno = EDQUOT;
 		return 0;
 	}
 
@@ -124,7 +123,7 @@ opdl_port_link(struct rte_eventdev *dev,
 			     dev->data->dev_id,
 				p->id,
 				queues[0]);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
@@ -135,7 +134,7 @@ opdl_port_link(struct rte_eventdev *dev,
 				p->id,
 				p->external_qid,
 				queues[0]);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
@@ -161,7 +160,7 @@ opdl_port_unlink(struct rte_eventdev *dev,
 			     dev->data->dev_id,
 			     queues[0],
 			     p->id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 	RTE_SET_USED(nb_unlinks);
@@ -288,7 +287,8 @@ opdl_queue_setup(struct rte_eventdev *dev,
 		}
 	}
 	/* Check if queue id has been setup already */
-	for (uint32_t i = 0; i < device->nb_q_md; i++) {
+	uint32_t i;
+	for (i = 0; i < device->nb_q_md; i++) {
 		if (device->q_md[i].ext_id == queue_id) {
 			PMD_DRV_LOG(ERR, "DEV_ID:[%02d] : "
 				     "queue id %u already setup\n",
@@ -390,8 +390,8 @@ opdl_dump(struct rte_eventdev *dev, FILE *f)
 
 	fprintf(f,
 		"\n\n -- RING STATISTICS --\n");
-
-	for (uint32_t i = 0; i < device->nb_opdls; i++)
+	uint32_t i;
+	for (i = 0; i < device->nb_opdls; i++)
 		opdl_ring_dump(device->opdl[i], f);
 
 	fprintf(f,
@@ -400,7 +400,7 @@ opdl_dump(struct rte_eventdev *dev, FILE *f)
 		"Av. Grant Size     Av. Cycles PP"
 		"      Empty DEQs   Non Empty DEQs   Pkts Processed\n");
 
-	for (uint32_t i = 0; i < device->max_port_nb; i++) {
+	for (i = 0; i < device->max_port_nb; i++) {
 		char queue_id[64];
 		char total_cyc[64];
 		const char *p_type;
@@ -422,16 +422,17 @@ opdl_dump(struct rte_eventdev *dev, FILE *f)
 			else
 				p_type = "????";
 
-			sprintf(queue_id, "%02u", port->external_qid);
+			snprintf(queue_id, sizeof(queue_id), "%02u",
+					port->external_qid);
 			if (port->p_type == OPDL_REGULAR_PORT ||
 					port->p_type == OPDL_ASYNC_PORT)
-				sprintf(total_cyc,
+				snprintf(total_cyc, sizeof(total_cyc),
 					" %'16"PRIu64"",
 					(cpg != 0 ?
 					 port->port_stat[total_cycles] / cpg
 					 : 0));
 			else
-				sprintf(total_cyc,
+				snprintf(total_cyc, sizeof(total_cyc),
 					"             ----");
 			fprintf(f,
 				"%4s %10u %8u %9s %'16"PRIu64" %'16"PRIu64" %s "
@@ -607,7 +608,7 @@ set_do_test(const char *key __rte_unused, const char *value, void *opaque)
 static int
 opdl_probe(struct rte_vdev_device *vdev)
 {
-	static const struct rte_eventdev_ops evdev_opdl_ops = {
+	static struct rte_eventdev_ops evdev_opdl_ops = {
 		.dev_configure = opdl_dev_configure,
 		.dev_infos_get = opdl_info_get,
 		.dev_close = opdl_close,
@@ -753,16 +754,7 @@ static struct rte_vdev_driver evdev_opdl_pmd_drv = {
 	.remove = opdl_remove
 };
 
-RTE_INIT(opdl_init_log);
-
-static void
-opdl_init_log(void)
-{
-	opdl_logtype_driver = rte_log_register("eventdev.opdl.driver");
-	if (opdl_logtype_driver >= 0)
-		rte_log_set_level(opdl_logtype_driver, RTE_LOG_INFO);
-}
-
+RTE_LOG_REGISTER(opdl_logtype_driver, pmd.event.opdl.driver, INFO);
 
 RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_OPDL_PMD, evdev_opdl_pmd_drv);
 RTE_PMD_REGISTER_PARAM_STRING(event_opdl, NUMA_NODE_ARG "=<int>"