Since abort is on the Tier 1 list of words to replace;
just remove the unnecessary part of the log message.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
drivers/net/ionic/ionic_dev_pci.c | 6 +++---
drivers/net/ionic/ionic_ethdev.c | 18 +++++++++---------
drivers/net/ionic/ionic_lif.c | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ionic/ionic_dev_pci.c
b/drivers/net/ionic/ionic_dev_pci.c
index 5e74a6da7149..aec76b6f0024 100644
--- a/drivers/net/ionic/ionic_dev_pci.c
+++ b/drivers/net/ionic/ionic_dev_pci.c
@@ -43,13 +43,13 @@ ionic_pci_setup(struct ionic_adapter *adapter)
/* BAR0: dev_cmd and interrupts */
if (num_bars < 1) {
- IONIC_PRINT(ERR, "No bars found, aborting\n");
+ IONIC_PRINT(ERR, "No bars found\n");
return -EFAULT;
}
if (bar->len < IONIC_BAR0_SIZE) {
IONIC_PRINT(ERR,
- "Resource bar size %lu too small, aborting\n",
+ "Resource bar size %lu too small\n",
bar->len);
return -EFAULT;
}
@@ -84,7 +84,7 @@ ionic_pci_setup(struct ionic_adapter *adapter)
/* BAR1: doorbells */
bar++;
if (num_bars < 2) {
- IONIC_PRINT(ERR, "Doorbell bar missing, aborting\n");
+ IONIC_PRINT(ERR, "Doorbell bar missing\n");
return -EFAULT;
}
diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 340fd0cd5923..2eee70d226dd 100644
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -1030,14 +1030,14 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void
*init_params)
err = ionic_lif_alloc(lif);
if (err) {
- IONIC_PRINT(ERR, "Cannot allocate LIFs: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot allocate LIFs: %d",
err);
goto err;
}
err = ionic_lif_init(lif);
if (err) {
- IONIC_PRINT(ERR, "Cannot init LIFs: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init LIFs: %d", err);
goto err_free_lif;
}
@@ -1144,48 +1144,48 @@ eth_ionic_dev_probe(void *bus_dev, struct rte_device
*rte_dev,
/* Discover ionic dev resources */
err = ionic_setup(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot setup device: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot setup device: %d", err);
goto err_free_adapter;
}
err = ionic_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify device: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot identify device: %d",
err);
goto err_free_adapter;
}
err = ionic_init(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot init device: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init device: %d", err);
goto err_free_adapter;
}
/* Configure the ports */
err = ionic_port_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify port: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot identify port: %d",
err);
goto err_free_adapter;
}
err = ionic_port_init(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot init port: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init port: %d", err);
goto err_free_adapter;
}
/* Configure LIFs */
err = ionic_lif_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify lif: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot identify lif: %d", err);
goto err_free_adapter;
}
/* Allocate and init LIFs */
err = ionic_lifs_size(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot size LIFs: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot size LIFs: %d", err);
goto err_free_adapter;
}
diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 25b490deb626..1944205428bc 100644
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -1045,7 +1045,7 @@ ionic_lif_alloc(struct ionic_lif *lif)
lif->kern_dbpage = adapter->idev.db_pages;
if (!lif->kern_dbpage) {
- IONIC_PRINT(ERR, "Cannot map dbpage, aborting");
+ IONIC_PRINT(ERR, "Cannot map dbpage");
return -ENOMEM;
}
--
2.39.2
