All of lore.kernel.org
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@kernel.org>
To: "David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>
Cc: Leon Romanovsky <leonro@mellanox.com>,
	Derek Chickles <dchickles@marvell.com>,
	Felix Manlunas <fmanlunas@marvell.com>,
	netdev@vger.kernel.org,
	Raghu Vatsavayi <rvatsavayi@caviumnetworks.com>,
	Satanand Burla <sburla@marvell.com>
Subject: [PATCH net-next 05/23] net/liquidio: Delete non-working LIQUIDIO_PACKAGE check
Date: Sun,  1 Mar 2020 16:44:38 +0200	[thread overview]
Message-ID: <20200301144457.119795-6-leon@kernel.org> (raw)
In-Reply-To: <20200301144457.119795-1-leon@kernel.org>

From: Leon Romanovsky <leonro@mellanox.com>

Size of LIQUIDIO_PACKAGE is 0 and it means that checks of package
version never worked, delete dead code.

Fixes: 3258124534f6 ("liquidio: Consolidate common functionality")
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/net/ethernet/cavium/liquidio/liquidio_common.h |  1 -
 drivers/net/ethernet/cavium/liquidio/octeon_console.c  | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
index 2d61790c2e51..4da90757cd3f 100644
--- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
+++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
@@ -25,7 +25,6 @@
 
 #include "octeon_config.h"
 
-#define LIQUIDIO_PACKAGE ""
 #define LIQUIDIO_BASE_MAJOR_VERSION 1
 #define LIQUIDIO_BASE_MINOR_VERSION 7
 #define LIQUIDIO_BASE_MICRO_VERSION 2
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
index dfc77507b159..cecc7642ad09 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
@@ -840,17 +840,11 @@ int octeon_download_firmware(struct octeon_device *oct, const u8 *data,
 		return -EINVAL;
 	}
 
-	if (strncmp(LIQUIDIO_PACKAGE, h->version, strlen(LIQUIDIO_PACKAGE))) {
-		dev_err(&oct->pci_dev->dev, "Unmatched firmware package type. Expected %s, got %s.\n",
-			LIQUIDIO_PACKAGE, h->version);
-		return -EINVAL;
-	}
-
-	if (memcmp(LIQUIDIO_BASE_VERSION, h->version + strlen(LIQUIDIO_PACKAGE),
+	if (memcmp(LIQUIDIO_BASE_VERSION, h->version,
 		   strlen(LIQUIDIO_BASE_VERSION))) {
 		dev_err(&oct->pci_dev->dev, "Unmatched firmware version. Expected %s.x, got %s.\n",
 			LIQUIDIO_BASE_VERSION,
-			h->version + strlen(LIQUIDIO_PACKAGE));
+			h->version);
 		return -EINVAL;
 	}
 
-- 
2.24.1


  parent reply	other threads:[~2020-03-01 14:45 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-01 14:44 [PATCH net-next 00/23] Clean driver, module and FW versions Leon Romanovsky
2020-03-01 14:44 ` Leon Romanovsky
2020-03-01 14:44 ` Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 01/23] net/broadcom: Clean broadcom code from driver versions Leon Romanovsky
2020-03-01 14:44   ` Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 02/23] net/broadcom: Don't set N/A FW if it is not available Leon Romanovsky
2020-03-01 14:44   ` Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 03/23] net/brocade: Delete driver version Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 04/23] net/liquidio: Delete driver version assignment Leon Romanovsky
2020-03-01 14:44 ` Leon Romanovsky [this message]
2020-03-01 14:44 ` [PATCH net-next 06/23] net/cavium: Clean driver versions Leon Romanovsky
2020-03-01 14:44   ` Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 07/23] net/cavium: Delete N/A assignments for ethtool Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 08/23] net/chelsio: Delete drive and module versions Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 09/23] net/chelsio: Don't set N/A for not available FW Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 10/23] net/cirrus: Delete driver version Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 11/23] net/cisco: Delete driver and module versions Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 12/23] net/cortina: Delete driver version from ethtool output Leon Romanovsky
2020-03-01 14:44   ` Leon Romanovsky
2020-03-02  8:33   ` Linus Walleij
2020-03-02  8:33     ` Linus Walleij
2020-03-01 14:44 ` [PATCH net-next 13/23] net/davicom: Delete ethtool version assignment Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 14/23] net/dec: Delete driver versions Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 15/23] net/dlink: Remove driver version and release date Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 16/23] net/dnet: Delete static version from the driver Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 17/23] net/emulex: Delete driver version Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 18/23] net/faraday: Delete driver version from the drivers Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 19/23] net/fealnx: Delete driver version Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 20/23] net/freescale: Clean drivers from static versions Leon Romanovsky
2020-03-01 14:44   ` Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 21/23] net/freescale: Don't set zero if FW not-available in dpaa Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 22/23] net/freescale: Don't set zero if FW not-available in ucc_geth Leon Romanovsky
2020-03-01 14:44   ` Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 23/23] net/freescale: Don't set zero if FW iand bus not-available in gianfar Leon Romanovsky
2020-03-02  3:02 ` [PATCH net-next 00/23] Clean driver, module and FW versions David Miller
2020-03-02  3:02   ` David Miller
2020-03-02  3:02   ` David Miller
2020-03-02 10:44 ` Madalin Bucur (OSS)
2020-03-02 10:44   ` Madalin Bucur (OSS)
2020-03-04  1:55 ` David Miller
2020-03-04  1:55   ` David Miller
2020-03-04  1:55   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200301144457.119795-6-leon@kernel.org \
    --to=leon@kernel.org \
    --cc=davem@davemloft.net \
    --cc=dchickles@marvell.com \
    --cc=fmanlunas@marvell.com \
    --cc=kuba@kernel.org \
    --cc=leonro@mellanox.com \
    --cc=netdev@vger.kernel.org \
    --cc=rvatsavayi@caviumnetworks.com \
    --cc=sburla@marvell.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.