From patchwork Fri Aug 18 02:52:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130492 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9358F41B5F; Fri, 18 Aug 2023 04:53:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A23B4327C; Fri, 18 Aug 2023 04:53:13 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id 762434326C for ; Fri, 18 Aug 2023 04:53:08 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-26d46664d00so119804a91.1 for ; Thu, 17 Aug 2023 19:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327187; x=1692931987; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6IDHGalblq47mylxPUD5jx9nzP3jR3zvYuVOQ6+xW/A=; b=pCD1Zj+nbgJrWJcHon99U8VtIcXMH5Il7se49w384yHVIYM8Ss9Mfy1BGXiugHvg7X ds5/54BDvhZW6g0mNJt1UHbID28/jfJCGOPJ4EF58+mRQ3NspRz28OiT4iU7TCvYX8WS cOqkByJzSz6NSnKev5W6lhrewGjrKyG2Rpt+fxLGZ+CUwC1dmQ5jMNcvJ1pDaIVYnU42 9VmpYzs4jF884VhZAU6N1xtpETPnHd1LllKnXW+s147QKwRpz5lyome0TAoexkCuaU/H KLREM9FNA94dc4Y+KSGzDDlfA6vEqS2/B0CqVpNL1y7mhUcJxzDhYPskd7EfxwBaVtFA 4fDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327187; x=1692931987; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6IDHGalblq47mylxPUD5jx9nzP3jR3zvYuVOQ6+xW/A=; b=ALzZY2MlvLI2nWt4xgxoiZnIPWMWMtnjb+9Q4kfYQFx0hD//YVRUBpagL6fBwDNH2f 1LLfd4PtSgmWM0rY8mhFCEqxUI2siC3C95hum2yeHSmWKaYTMgBxqAK0WoJuuA4dMn+p hpBwtf3Sjs5qIjKSYLRYiiQCXGK582SUI2O4wDPzHBtdn3uqn+Sthk5/8AE2gLff2Eby 41P8FJ2kcQlVRtYEz3nAEsxyci/VnGtqoNON5wKhrjTs1wE0R5o3fk4XHOBiUQHefVcx XXlXq+D/FgOE09eM4t/9qeVqXNmfMPvtq3/6Tsd+y3zTc5YMgjznQqdD/CqUFNWT3ojp W/Yw== X-Gm-Message-State: AOJu0Ywkfb9xfcOBkh3gWNab67pOqGgaiSTuuGJgqGkEa8hXl+cd4VP9 Fo0PyFFufws5fWFf2DF4M8Y57FahBwFc4tQO2mI3gg== X-Google-Smtp-Source: AGHT+IHyOxlwaqFdQ7uHaAGQTIIMO4ji9Y2OfB28YRahrudvETapqQOUhWcjACjGO/LyudxQLoU8Sg== X-Received: by 2002:a17:90a:d902:b0:269:1860:c3bd with SMTP id c2-20020a17090ad90200b002691860c3bdmr1189868pjv.19.1692327187418; Thu, 17 Aug 2023 19:53:07 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Boyer Subject: [PATCH 08/14] net/ionic: remove word aborting Date: Thu, 17 Aug 2023 19:52:43 -0700 Message-Id: <20230818025249.33994-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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; }