Remove duplicate newline `\n` from the debugging macros
to avoid double `\n\n`.
Signed-off-by: Hemant Agrawal <hemant.agra...@nxp.com>
---
drivers/bus/dpaa/base/fman/fman.c | 58 ++++++++++++++---------------
drivers/bus/dpaa/dpaa_bus.c | 12 +++---
drivers/event/dpaa/dpaa_eventdev.c | 20 +++++-----
drivers/mempool/dpaa/dpaa_mempool.c | 4 +-
drivers/net/dpaa/dpaa_ethdev.c | 42 ++++++++++-----------
drivers/net/dpaa/dpaa_flow.c | 4 +-
drivers/net/dpaa/fmlib/fm_lib.c | 6 +--
drivers/net/dpaa/fmlib/fm_vsp.c | 10 ++---
8 files changed, 77 insertions(+), 79 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/fman.c
b/drivers/bus/dpaa/base/fman/fman.c
index 953f7d7061..41195eb0a7 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -244,13 +244,13 @@ fman_if_init(const struct device_node *dpa_node)
/* Obtain the MAC node used by this interface except macless */
mac_phandle = of_get_property(dpa_node, mprop, &lenp);
if (!mac_phandle) {
- FMAN_ERR(-EINVAL, "%s: no %s\n", dname, mprop);
+ FMAN_ERR(-EINVAL, "%s: no %s", dname, mprop);
return -EINVAL;
}
assert(lenp == sizeof(phandle));
mac_node = of_find_node_by_phandle(*mac_phandle);
if (!mac_node) {
- FMAN_ERR(-ENXIO, "%s: bad 'fsl,fman-mac\n", dname);
+ FMAN_ERR(-ENXIO, "%s: bad 'fsl,fman-mac", dname);
return -ENXIO;
}
mname = mac_node->full_name;
@@ -262,19 +262,19 @@ fman_if_init(const struct device_node *dpa_node)
ports_phandle = of_get_property(mac_node, "fsl,fman-ports",
&lenp);
if (!ports_phandle) {
- FMAN_ERR(-EINVAL, "%s: no fsl,port-handles\n",
+ FMAN_ERR(-EINVAL, "%s: no fsl,port-handles",
mname);
return -EINVAL;
}
assert(lenp == (2 * sizeof(phandle)));
rx_node = of_find_node_by_phandle(ports_phandle[0]);
if (!rx_node) {
- FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[0]\n", mname);
+ FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[0]", mname);
return -ENXIO;
}
tx_node = of_find_node_by_phandle(ports_phandle[1]);
if (!tx_node) {
- FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[1]\n", mname);
+ FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[1]", mname);
return -ENXIO;
}
@@ -282,8 +282,7 @@ fman_if_init(const struct device_node *dpa_node)
if (of_device_is_compatible(dpa_node, "fsl,dpa-ethernet")) {
port_cell_idx = of_get_property(rx_node, "cell-index", &lenp);
if (!port_cell_idx) {
- FMAN_ERR(-ENXIO,
- "%s: no cell-index for port\n", mname);
+ FMAN_ERR(-ENXIO, "%s: no cell-index for port", mname);
return -ENXIO;
}
assert(lenp == sizeof(*port_cell_idx));
@@ -305,8 +304,7 @@ fman_if_init(const struct device_node *dpa_node)
ext_args_cell_idx = of_get_property(ext_args_node,
"cell-index", &lenp);
if (!ext_args_cell_idx) {
- FMAN_ERR(-ENXIO,
- "%s: no cell-index for ext args\n",
+ FMAN_ERR(-ENXIO, "%s: no cell-index for ext
args",
mname);
return -ENXIO;
}
@@ -343,7 +341,7 @@ fman_if_init(const struct device_node *dpa_node)
/* Allocate an object for this network interface */
__if = rte_malloc(NULL, sizeof(*__if), RTE_CACHE_LINE_SIZE);
if (!__if) {
- FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if));
+ FMAN_ERR(-ENOMEM, "malloc(%zu)", sizeof(*__if));
goto err;
}
memset(__if, 0, sizeof(*__if));
@@ -356,12 +354,12 @@ fman_if_init(const struct device_node *dpa_node)
/* Map the CCSR regs for the MAC node */
regs_addr = of_get_address(mac_node, 0, &__if->regs_size, NULL);
if (!regs_addr) {
- FMAN_ERR(-EINVAL, "of_get_address(%s)\n", mname);
+ FMAN_ERR(-EINVAL, "of_get_address(%s)", mname);
goto err;
}
phys_addr = of_translate_address(mac_node, regs_addr);
if (!phys_addr) {
- FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)\n",
+ FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)",
mname, regs_addr);
goto err;
}
@@ -369,7 +367,7 @@ fman_if_init(const struct device_node *dpa_node)
PROT_READ | PROT_WRITE, MAP_SHARED,
fman_ccsr_map_fd, phys_addr);
if (__if->ccsr_map == MAP_FAILED) {
- FMAN_ERR(-errno, "mmap(0x%"PRIx64")\n", phys_addr);
+ FMAN_ERR(-errno, "mmap(0x%"PRIx64")", phys_addr);
goto err;
}
na = of_n_addr_cells(mac_node);
@@ -380,13 +378,13 @@ fman_if_init(const struct device_node *dpa_node)
fman_node = of_get_parent(mac_node);
na = of_n_addr_cells(mac_node);
if (!fman_node) {
- FMAN_ERR(-ENXIO, "of_get_parent(%s)\n", mname);
+ FMAN_ERR(-ENXIO, "of_get_parent(%s)", mname);
goto err;
}
fname = fman_node->full_name;
cell_idx = of_get_property(fman_node, "cell-index", &lenp);
if (!cell_idx) {
- FMAN_ERR(-ENXIO, "%s: no cell-index)\n", fname);
+ FMAN_ERR(-ENXIO, "%s: no cell-index)", fname);
goto err;
}
assert(lenp == sizeof(*cell_idx));
@@ -395,7 +393,7 @@ fman_if_init(const struct device_node *dpa_node)
if (!get_once) {
_errno = fman_get_ip_rev(fman_node);
if (_errno) {
- FMAN_ERR(-ENXIO, "%s: ip_rev is not available\n",
+ FMAN_ERR(-ENXIO, "%s: ip_rev is not available",
fname);
goto err;
}
@@ -425,7 +423,7 @@ fman_if_init(const struct device_node *dpa_node)
char_prop = of_get_property(mac_node, "phy-connection-type",
NULL);
if (!char_prop) {
- printf("memac: unknown MII type assuming 1G\n");
+ FMAN_ERR(-EINVAL, "memac: unknown MII type assuming
1G");
/* Right now forcing memac to 1g in case of error*/
__if->__if.mac_type = fman_mac_1g;
} else {
@@ -440,7 +438,7 @@ fman_if_init(const struct device_node *dpa_node)
__if->__if.mac_type = fman_mac_10g;
}
} else {
- FMAN_ERR(-EINVAL, "%s: unknown MAC type\n", mname);
+ FMAN_ERR(-EINVAL, "%s: unknown MAC type", mname);
goto err;
}
@@ -463,7 +461,7 @@ fman_if_init(const struct device_node *dpa_node)
mac_addr = of_get_property(mac_node, "local-mac-address",
&lenp);
if (!mac_addr) {
- FMAN_ERR(-EINVAL, "%s: no local-mac-address\n",
+ FMAN_ERR(-EINVAL, "%s: no local-mac-address",
mname);
goto err;
}
@@ -473,19 +471,19 @@ fman_if_init(const struct device_node *dpa_node)
tx_channel_id = of_get_property(tx_node, "fsl,qman-channel-id",
&lenp);
if (!tx_channel_id) {
- FMAN_ERR(-EINVAL, "%s: no fsl-qman-channel-id\n",
+ FMAN_ERR(-EINVAL, "%s: no fsl-qman-channel-id",
tx_node->full_name);
goto err;
}
regs_addr = of_get_address(rx_node, 0, &__if->regs_size, NULL);
if (!regs_addr) {
- FMAN_ERR(-EINVAL, "of_get_address(%s)\n", mname);
+ FMAN_ERR(-EINVAL, "of_get_address(%s)", mname);
goto err;
}
phys_addr = of_translate_address(rx_node, regs_addr);
if (!phys_addr) {
- FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)\n",
+ FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)",
mname, regs_addr);
goto err;
}
@@ -493,7 +491,7 @@ fman_if_init(const struct device_node *dpa_node)
PROT_READ | PROT_WRITE, MAP_SHARED,
fman_ccsr_map_fd, phys_addr);
if (__if->bmi_map == MAP_FAILED) {
- FMAN_ERR(-errno, "mmap(0x%"PRIx64")\n", phys_addr);
+ FMAN_ERR(-errno, "mmap(0x%"PRIx64")", phys_addr);
goto err;
}
@@ -507,7 +505,7 @@ fman_if_init(const struct device_node *dpa_node)
*/
rx_phandle = of_get_property(dpa_node, rprop, &lenp);
if (!rx_phandle) {
- FMAN_ERR(-EINVAL, "%s: no fsl,qman-frame-queues-rx\n", dname);
+ FMAN_ERR(-EINVAL, "%s: no fsl,qman-frame-queues-rx", dname);
goto err;
}
@@ -542,7 +540,7 @@ fman_if_init(const struct device_node *dpa_node)
tx_phandle = of_get_property(dpa_node,
"fsl,qman-frame-queues-tx", &lenp);
if (!tx_phandle) {
- FMAN_ERR(-EINVAL, "%s: no fsl,qman-frame-queues-tx\n", dname);
+ FMAN_ERR(-EINVAL, "%s: no fsl,qman-frame-queues-tx", dname);
goto err;
}
@@ -562,7 +560,7 @@ fman_if_init(const struct device_node *dpa_node)
pools_phandle = of_get_property(dpa_node, "fsl,bman-buffer-pools",
&lenp);
if (!pools_phandle) {
- FMAN_ERR(-EINVAL, "%s: no fsl,bman-buffer-pools\n", dname);
+ FMAN_ERR(-EINVAL, "%s: no fsl,bman-buffer-pools", dname);
goto err;
}
/* For each pool, parse the corresponding node and add a pool object
@@ -578,13 +576,13 @@ fman_if_init(const struct device_node *dpa_node)
/* Allocate an object for the pool */
bpool = rte_malloc(NULL, sizeof(*bpool), RTE_CACHE_LINE_SIZE);
if (!bpool) {
- FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*bpool));
+ FMAN_ERR(-ENOMEM, "malloc(%zu)", sizeof(*bpool));
goto err;
}
/* Find the pool node */
pool_node = of_find_node_by_phandle(*pools_phandle);
if (!pool_node) {
- FMAN_ERR(-ENXIO, "%s: bad fsl,bman-buffer-pools\n",
+ FMAN_ERR(-ENXIO, "%s: bad fsl,bman-buffer-pools",
dname);
rte_free(bpool);
goto err;
@@ -593,7 +591,7 @@ fman_if_init(const struct device_node *dpa_node)
/* Extract the BPID property */
prop = of_get_property(pool_node, "fsl,bpid", &proplen);
if (!prop) {
- FMAN_ERR(-EINVAL, "%s: no fsl,bpid\n", pname);
+ FMAN_ERR(-EINVAL, "%s: no fsl,bpid", pname);
rte_free(bpool);
goto err;
}
@@ -691,7 +689,7 @@ fman_init(void)
for_each_child_node(parent_node, dpa_node) {
_errno = fman_if_init(dpa_node);
if (_errno) {
- FMAN_ERR(_errno, "if_init(%s)\n", dpa_node->full_name);
+ FMAN_ERR(_errno, "if_init(%s)", dpa_node->full_name);
goto err;
}
}
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 5d4352bb3c..e483428ddc 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -326,7 +326,7 @@ int rte_dpaa_portal_init(void *arg)
dpaa_seqn_dynfield_offset =
rte_mbuf_dynfield_register(&dpaa_seqn_dynfield_desc);
if (dpaa_seqn_dynfield_offset < 0) {
- DPAA_BUS_LOG(ERR, "Failed to register mbuf field for dpaa
sequence number\n");
+ DPAA_BUS_LOG(ERR, "Failed to register mbuf field for dpaa
sequence number");
return -rte_errno;
}
@@ -673,7 +673,7 @@ rte_dpaa_bus_probe(void)
if (dev->device_type == FSL_DPAA_ETH) {
ret = rte_dpaa_setup_intr(dev->intr_handle);
if (ret)
- DPAA_BUS_ERR("Error setting up interrupt.\n");
+ DPAA_BUS_ERR("Error setting up interrupt.");
}
}
@@ -734,13 +734,13 @@ rte_dpaa_find_device(const struct rte_device *start,
rte_dev_cmp_t cmp,
while (dev != NULL) {
if (cmp(&dev->device, data) == 0) {
- DPAA_BUS_DEBUG("Found dev=(%s)\n", dev->device.name);
+ DPAA_BUS_DEBUG("Found dev=(%s)", dev->device.name);
return &dev->device;
}
dev = TAILQ_NEXT(dev, next);
}
- DPAA_BUS_DEBUG("Unable to find any device\n");
+ DPAA_BUS_DEBUG("Unable to find any device");
return NULL;
}
@@ -786,14 +786,14 @@ dpaa_bus_dev_iterate(const void *start, const char *str,
/* Expectation is that device would be name=device_name */
if (strncmp(str, "name=", 5) != 0) {
- DPAA_BUS_DEBUG("Invalid device string (%s)\n", str);
+ DPAA_BUS_DEBUG("Invalid device string (%s)", str);
return NULL;
}
/* Now that name=device_name format is available, split */
dup = strdup(str);
if (dup == NULL) {
- DPAA_BUS_DEBUG("Dup string (%s) failed!\n", str);
+ DPAA_BUS_DEBUG("Dup string (%s) failed!", str);
return NULL;
}
dev_name = dup + strlen("name=");
diff --git a/drivers/event/dpaa/dpaa_eventdev.c
b/drivers/event/dpaa/dpaa_eventdev.c
index 919e922298..f8cf48bd2e 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -386,13 +386,13 @@ dpaa_event_dev_configure(const struct rte_eventdev *dev)
sizeof(uint32_t) * priv->nb_event_queues,
RTE_CACHE_LINE_SIZE);
if (ch_id == NULL) {
- DPAA_EVENTDEV_ERR("Fail to allocate memory for dpaa
channels\n");
+ DPAA_EVENTDEV_ERR("Fail to allocate memory for dpaa channels");
return -ENOMEM;
}
/* Create requested event queues within the given event device */
ret = qman_alloc_pool_range(ch_id, priv->nb_event_queues, 1, 0);
if (ret < 0) {
- DPAA_EVENTDEV_ERR("qman_alloc_pool_range %u, err =%d\n",
+ DPAA_EVENTDEV_ERR("qman_alloc_pool_range %u, err =%d",
priv->nb_event_queues, ret);
rte_free(ch_id);
return ret;
@@ -655,7 +655,7 @@ dpaa_event_eth_rx_adapter_queue_add(
queue_conf);
if (ret) {
DPAA_EVENTDEV_ERR(
- "Event Queue attach failed:%d\n", ret);
+ "Event Queue attach failed:%d", ret);
goto detach_configured_queues;
}
}
@@ -664,7 +664,7 @@ dpaa_event_eth_rx_adapter_queue_add(
ret = dpaa_eth_eventq_attach(eth_dev, rx_queue_id, ch_id, queue_conf);
if (ret)
- DPAA_EVENTDEV_ERR("dpaa_eth_eventq_attach failed:%d\n", ret);
+ DPAA_EVENTDEV_ERR("dpaa_eth_eventq_attach failed:%d", ret);
return ret;
detach_configured_queues:
@@ -691,7 +691,7 @@ dpaa_event_eth_rx_adapter_queue_del(const struct
rte_eventdev *dev,
ret = dpaa_eth_eventq_detach(eth_dev, i);
if (ret)
DPAA_EVENTDEV_ERR(
- "Event Queue detach failed:%d\n", ret);
+ "Event Queue detach failed:%d", ret);
}
return 0;
@@ -699,7 +699,7 @@ dpaa_event_eth_rx_adapter_queue_del(const struct
rte_eventdev *dev,
ret = dpaa_eth_eventq_detach(eth_dev, rx_queue_id);
if (ret)
- DPAA_EVENTDEV_ERR("dpaa_eth_eventq_detach failed:%d\n", ret);
+ DPAA_EVENTDEV_ERR("dpaa_eth_eventq_detach failed:%d", ret);
return ret;
}
@@ -762,7 +762,7 @@ dpaa_eventdev_crypto_queue_add_all(const struct
rte_eventdev *dev,
ret = dpaa_sec_eventq_attach(cryptodev, i,
ch_id, ev);
if (ret) {
- DPAA_EVENTDEV_ERR("dpaa_sec_eventq_attach failed: ret
%d\n",
+ DPAA_EVENTDEV_ERR("dpaa_sec_eventq_attach failed: ret
%d",
ret);
goto fail;
}
@@ -796,7 +796,7 @@ dpaa_eventdev_crypto_queue_add(const struct rte_eventdev
*dev,
ch_id, &conf->ev);
if (ret) {
DPAA_EVENTDEV_ERR(
- "dpaa_sec_eventq_attach failed: ret: %d\n", ret);
+ "dpaa_sec_eventq_attach failed: ret: %d", ret);
return ret;
}
return 0;
@@ -816,7 +816,7 @@ dpaa_eventdev_crypto_queue_del_all(const struct
rte_eventdev *dev,
ret = dpaa_sec_eventq_detach(cdev, i);
if (ret) {
DPAA_EVENTDEV_ERR(
- "dpaa_sec_eventq_detach failed:ret %d\n", ret);
+ "dpaa_sec_eventq_detach failed:ret %d", ret);
return ret;
}
}
@@ -839,7 +839,7 @@ dpaa_eventdev_crypto_queue_del(const struct rte_eventdev
*dev,
ret = dpaa_sec_eventq_detach(cryptodev, rx_queue_id);
if (ret) {
DPAA_EVENTDEV_ERR(
- "dpaa_sec_eventq_detach failed: ret: %d\n", ret);
+ "dpaa_sec_eventq_detach failed: ret: %d", ret);
return ret;
}
diff --git a/drivers/mempool/dpaa/dpaa_mempool.c
b/drivers/mempool/dpaa/dpaa_mempool.c
index 0b484b3d9c..21e8938cc6 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.c
+++ b/drivers/mempool/dpaa/dpaa_mempool.c
@@ -285,7 +285,7 @@ dpaa_mbuf_get_count(const struct rte_mempool *mp)
MEMPOOL_INIT_FUNC_TRACE();
if (!mp || !mp->pool_data) {
- DPAA_MEMPOOL_ERR("Invalid mempool provided\n");
+ DPAA_MEMPOOL_ERR("Invalid mempool provided");
return 0;
}
@@ -303,7 +303,7 @@ dpaa_populate(struct rte_mempool *mp, unsigned int max_objs,
unsigned int total_elt_sz;
if (!mp || !mp->pool_data) {
- DPAA_MEMPOOL_ERR("Invalid mempool provided\n");
+ DPAA_MEMPOOL_ERR("Invalid mempool provided");
return 0;
}
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 093f9a8ff9..44bac67803 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -261,7 +261,7 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
if (dpaa_fm_config(dev,
eth_conf->rx_adv_conf.rss_conf.rss_hf)) {
dpaa_write_fm_config_to_file();
- DPAA_PMD_ERR("FM port configuration: Failed\n");
+ DPAA_PMD_ERR("FM port configuration: Failed");
return -1;
}
dpaa_write_fm_config_to_file();
@@ -393,7 +393,7 @@ static void dpaa_interrupt_handler(void *param)
bytes_read = read(rte_intr_fd_get(intr_handle), &buf,
sizeof(uint64_t));
if (bytes_read < 0)
- DPAA_PMD_ERR("Error reading eventfd\n");
+ DPAA_PMD_ERR("Error reading eventfd");
dpaa_eth_link_update(dev, 0);
rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
}
@@ -469,7 +469,7 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev)
/* DPAA FM deconfig */
if (!(default_q || fmc_q)) {
if (dpaa_fm_deconfig(dpaa_intf, dev->process_private))
- DPAA_PMD_WARN("DPAA FM deconfig failed\n");
+ DPAA_PMD_WARN("DPAA FM deconfig failed");
}
dpaa_dev = container_of(rdev, struct rte_dpaa_device, device);
@@ -721,7 +721,7 @@ static int dpaa_eth_link_update(struct rte_eth_dev *dev,
dpaa_intf->name, fif->mac_type);
}
- DPAA_PMD_INFO("Port %d Link is %s\n", dev->data->port_id,
+ DPAA_PMD_INFO("Port %d Link is %s", dev->data->port_id,
link->link_status ? "Up" : "Down");
return 0;
}
@@ -1027,7 +1027,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
}
} else {
DPAA_PMD_INFO("Base profile is associated to"
- " RXQ fqid:%d\r\n", rxq->fqid);
+ " RXQ fqid:%d", rxq->fqid);
if (fif->is_shared_mac) {
DPAA_PMD_ERR("Fatal: Base profile is associated"
" to shared interface on DPDK.");
@@ -1174,7 +1174,7 @@ dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,
if (dpaa_push_mode_max_queue)
DPAA_PMD_WARN("PUSH mode q and EVENTDEV are not compatible\n"
"PUSH mode already enabled for first %d queues.\n"
- "To disable set DPAA_PUSH_QUEUES_NUMBER to 0\n",
+ "To disable set DPAA_PUSH_QUEUES_NUMBER to 0",
dpaa_push_mode_max_queue);
dpaa_poll_queue_default_config(&opts);
@@ -1189,7 +1189,7 @@ dpaa_eth_eventq_attach(const struct rte_eth_dev *dev,
rxq->cb.dqrr_dpdk_cb = dpaa_rx_cb_atomic;
break;
case RTE_SCHED_TYPE_ORDERED:
- DPAA_PMD_ERR("Ordered queue schedule type is not supported\n");
+ DPAA_PMD_ERR("Ordered queue schedule type is not supported");
return -1;
default:
opts.fqd.fq_ctrl |= QM_FQCTRL_AVOIDBLOCK;
@@ -1461,12 +1461,12 @@ dpaa_dev_rss_hash_update(struct rte_eth_dev *dev,
if (!(default_q || fmc_q)) {
if (dpaa_fm_config(dev, rss_conf->rss_hf)) {
- DPAA_PMD_ERR("FM port configuration: Failed\n");
+ DPAA_PMD_ERR("FM port configuration: Failed");
return -1;
}
eth_conf->rx_adv_conf.rss_conf.rss_hf = rss_conf->rss_hf;
} else {
- DPAA_PMD_ERR("Function not supported\n");
+ DPAA_PMD_ERR("Function not supported");
return -ENOTSUP;
}
return 0;
@@ -1786,7 +1786,7 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
opts.we_mask |= QM_INITFQ_WE_CGID;
opts.fqd.cgid = cgr_tx->cgrid;
opts.fqd.fq_ctrl |= QM_FQCTRL_CGE;
- DPAA_PMD_DEBUG("Tx FQ tail drop enabled, threshold = %d\n",
+ DPAA_PMD_DEBUG("Tx FQ tail drop enabled, threshold = %d",
td_tx_threshold);
}
without_cgr:
@@ -1925,7 +1925,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
* queues.
*/
if (num_rx_fqs < 0 || num_rx_fqs > DPAA_MAX_NUM_PCD_QUEUES) {
- DPAA_PMD_ERR("Invalid number of RX queues\n");
+ DPAA_PMD_ERR("Invalid number of RX queues");
return -EINVAL;
}
@@ -1933,7 +1933,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
dpaa_intf->rx_queues = rte_zmalloc(NULL,
sizeof(struct qman_fq) * num_rx_fqs, MAX_CACHELINE);
if (!dpaa_intf->rx_queues) {
- DPAA_PMD_ERR("Failed to alloc mem for RX queues\n");
+ DPAA_PMD_ERR("Failed to alloc mem for RX queues");
return -ENOMEM;
}
} else {
@@ -1960,7 +1960,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
dpaa_intf->cgr_rx = rte_zmalloc(NULL,
sizeof(struct qman_cgr) * num_rx_fqs, MAX_CACHELINE);
if (!dpaa_intf->cgr_rx) {
- DPAA_PMD_ERR("Failed to alloc mem for cgr_rx\n");
+ DPAA_PMD_ERR("Failed to alloc mem for cgr_rx");
ret = -ENOMEM;
goto free_rx;
}
@@ -1979,7 +1979,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
ret = qman_alloc_fqid_range(dev_rx_fqids, num_rx_fqs,
num_rx_fqs, 0);
if (ret < 0) {
- DPAA_PMD_ERR("Failed to alloc rx fqid's\n");
+ DPAA_PMD_ERR("Failed to alloc rx fqid's");
goto free_rx;
}
}
@@ -2009,7 +2009,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
dpaa_intf->tx_queues = rte_zmalloc(NULL, sizeof(struct qman_fq) *
MAX_DPAA_CORES, MAX_CACHELINE);
if (!dpaa_intf->tx_queues) {
- DPAA_PMD_ERR("Failed to alloc mem for TX queues\n");
+ DPAA_PMD_ERR("Failed to alloc mem for TX queues");
ret = -ENOMEM;
goto free_rx;
}
@@ -2020,7 +2020,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
sizeof(struct qman_cgr) * MAX_DPAA_CORES,
MAX_CACHELINE);
if (!dpaa_intf->cgr_tx) {
- DPAA_PMD_ERR("Failed to alloc mem for cgr_tx\n");
+ DPAA_PMD_ERR("Failed to alloc mem for cgr_tx");
ret = -ENOMEM;
goto free_rx;
}
@@ -2184,7 +2184,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv,
if (!(default_q || fmc_q)) {
if (dpaa_fm_init()) {
- DPAA_PMD_ERR("FM init failed\n");
+ DPAA_PMD_ERR("FM init failed");
return -1;
}
}
@@ -2247,7 +2247,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv,
DPAA_MAX_SGS * sizeof(struct qm_sg_entry),
rte_socket_id());
if (dpaa_tx_sg_pool == NULL) {
- DPAA_PMD_ERR("SG pool creation failed\n");
+ DPAA_PMD_ERR("SG pool creation failed");
return -ENOMEM;
}
}
@@ -2297,17 +2297,17 @@ static void __attribute__((destructor(102)))
dpaa_finish(void)
if (dpaa_intf->port_handle)
if (dpaa_fm_deconfig(dpaa_intf, fif))
DPAA_PMD_WARN("DPAA FM "
- "deconfig failed\n");
+ "deconfig failed");
if (fif->num_profiles) {
if (dpaa_port_vsp_cleanup(dpaa_intf,
fif))
- DPAA_PMD_WARN("DPAA FM vsp
cleanup failed\n");
+ DPAA_PMD_WARN("DPAA FM vsp
cleanup failed");
}
}
}
if (is_global_init)
if (dpaa_fm_term())
- DPAA_PMD_WARN("DPAA FM term failed\n");
+ DPAA_PMD_WARN("DPAA FM term failed");
is_global_init = 0;
diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c
index b78477a59a..02aca78d05 100644
--- a/drivers/net/dpaa/dpaa_flow.c
+++ b/drivers/net/dpaa/dpaa_flow.c
@@ -531,7 +531,7 @@ static inline int set_port_pcd(struct dpaa_if *dpaa_intf)
/* FM PORT DeletePCD */
ret = fm_port_delete_pcd(dpaa_intf->port_handle);
if (ret != E_OK) {
- DPAA_PMD_ERR("fm_port_delete_pcd: Failed\n");
+ DPAA_PMD_ERR("fm_port_delete_pcd: Failed");
return ret;
}
return -1;
@@ -686,7 +686,7 @@ static inline int set_fm_port_handle(struct dpaa_if
*dpaa_intf,
/* FM PORT Open */
dpaa_intf->port_handle = fm_port_open(&fm_port_params);
if (!dpaa_intf->port_handle) {
- DPAA_PMD_ERR("fm_port_open: Failed\n");
+ DPAA_PMD_ERR("fm_port_open: Failed");
return -1;
}
diff --git a/drivers/net/dpaa/fmlib/fm_lib.c b/drivers/net/dpaa/fmlib/fm_lib.c
index 1d6816050c..68b519ff8a 100644
--- a/drivers/net/dpaa/fmlib/fm_lib.c
+++ b/drivers/net/dpaa/fmlib/fm_lib.c
@@ -102,7 +102,7 @@ fm_get_api_version(t_handle h_fm, ioc_fm_api_version_t
*p_version)
ret = ioctl(p_dev->fd, FM_IOC_GET_API_VERSION, p_version);
if (ret) {
- DPAA_PMD_ERR("cannot get API version, error %i (%s)\n",
+ DPAA_PMD_ERR("cannot get API version, error %i (%s)",
errno, strerror(errno));
RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
}
@@ -275,7 +275,7 @@ fm_pcd_kg_scheme_set(t_handle h_fm_pcd,
ret = ioctl(p_pcd_dev->fd, FM_PCD_IOC_KG_SCHEME_SET, params);
if (ret) {
- DPAA_PMD_ERR(" cannot set kg scheme, error %i (%s)\n",
+ DPAA_PMD_ERR(" cannot set kg scheme, error %i (%s)",
errno, strerror(errno));
return NULL;
}
@@ -309,7 +309,7 @@ fm_pcd_kg_scheme_delete(t_handle h_scheme)
id.obj = UINT_TO_PTR(p_dev->id);
if (ioctl(p_pcd_dev->fd, FM_PCD_IOC_KG_SCHEME_DELETE, &id)) {
- DPAA_PMD_WARN("cannot delete kg scheme, error %i (%s)\n",
+ DPAA_PMD_WARN("cannot delete kg scheme, error %i (%s)",
errno, strerror(errno));
RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
}
diff --git a/drivers/net/dpaa/fmlib/fm_vsp.c b/drivers/net/dpaa/fmlib/fm_vsp.c
index 78efd93f22..a5901c8f6e 100644
--- a/drivers/net/dpaa/fmlib/fm_vsp.c
+++ b/drivers/net/dpaa/fmlib/fm_vsp.c
@@ -55,13 +55,13 @@ fm_vsp_config(t_fm_vsp_params *p_fm_vsp_params)
param.id = NULL;
if (ioctl(p_dev->fd, FM_IOC_VSP_CONFIG, ¶m)) {
- DPAA_PMD_ERR("%s ioctl error\n", __func__);
+ DPAA_PMD_ERR("ioctl error");
return NULL;
}
p_vsp_dev = (t_device *)malloc(sizeof(t_device));
if (!p_vsp_dev) {
- DPAA_PMD_ERR("FM VSP Params!\n");
+ DPAA_PMD_ERR("FM VSP Params!");
return NULL;
}
memset(p_vsp_dev, 0, sizeof(t_device));
@@ -87,7 +87,7 @@ fm_vsp_init(t_handle h_fm_vsp)
id.obj = UINT_TO_PTR(p_vsp_dev->id);
if (ioctl(p_dev->fd, FM_IOC_VSP_INIT, &id)) {
- DPAA_PMD_ERR("%s ioctl error\n", __func__);
+ DPAA_PMD_ERR("ioctl error");
RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
}
@@ -109,7 +109,7 @@ fm_vsp_free(t_handle h_fm_vsp)
id.obj = UINT_TO_PTR(p_vsp_dev->id);
if (ioctl(p_dev->fd, FM_IOC_VSP_FREE, &id)) {
- DPAA_PMD_ERR("%s ioctl error\n", __func__);
+ DPAA_PMD_ERR("ioctl error");
RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
}
@@ -138,7 +138,7 @@ fm_vsp_config_buffer_prefix_content(t_handle h_fm_vsp,
if (ioctl(p_dev->fd, FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT,
¶ms)) {
- DPAA_PMD_ERR("%s ioctl error\n", __func__);
+ DPAA_PMD_ERR("ioctl error");
RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
}
--
2.25.1
