From: Leon Romanovsky <leon@kernel.org>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Leon Romanovsky <leonro@mellanox.com>,
Ajit Khaparde <ajit.khaparde@broadcom.com>,
netdev@vger.kernel.org, Sathya Perla <sathya.perla@broadcom.com>,
Somnath Kotur <somnath.kotur@broadcom.com>,
Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Subject: [PATCH net-next 17/23] net/emulex: Delete driver version
Date: Sun, 1 Mar 2020 16:44:50 +0200 [thread overview]
Message-ID: <20200301144457.119795-18-leon@kernel.org> (raw)
In-Reply-To: <20200301144457.119795-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
Remove driver version in favor of general linux kernel version.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/net/ethernet/emulex/benet/be.h | 1 -
drivers/net/ethernet/emulex/benet/be_ethtool.c | 1 -
drivers/net/ethernet/emulex/benet/be_main.c | 5 +----
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index cf3e6f2892ff..6e9022083004 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -33,7 +33,6 @@
#include "be_hw.h"
#include "be_roce.h"
-#define DRV_VER "12.0.0.0"
#define DRV_NAME "be2net"
#define BE_NAME "Emulex BladeEngine2"
#define BE3_NAME "Emulex BladeEngine3"
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 022a54a1805b..9d9f0545fbfe 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -221,7 +221,6 @@ static void be_get_drvinfo(struct net_device *netdev,
struct be_adapter *adapter = netdev_priv(netdev);
strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
- strlcpy(drvinfo->version, DRV_VER, sizeof(drvinfo->version));
if (!memcmp(adapter->fw_ver, adapter->fw_on_flash, FW_VER_LEN))
strlcpy(drvinfo->fw_version, adapter->fw_ver,
sizeof(drvinfo->fw_version));
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 56f59db6ebf2..a7ac23a6862b 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -21,8 +21,7 @@
#include <net/busy_poll.h>
#include <net/vxlan.h>
-MODULE_VERSION(DRV_VER);
-MODULE_DESCRIPTION(DRV_DESC " " DRV_VER);
+MODULE_DESCRIPTION(DRV_DESC);
MODULE_AUTHOR("Emulex Corporation");
MODULE_LICENSE("GPL");
@@ -5949,8 +5948,6 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
struct net_device *netdev;
int status = 0;
- dev_info(&pdev->dev, "%s version is %s\n", DRV_NAME, DRV_VER);
-
status = pci_enable_device(pdev);
if (status)
goto do_none;
--
2.24.1
next prev parent reply other threads:[~2020-03-01 14:45 UTC|newest]
Thread overview: 27+ 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 ` [PATCH net-next 01/23] net/broadcom: Clean broadcom code from driver versions 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 ` [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 ` [PATCH net-next 05/23] net/liquidio: Delete non-working LIQUIDIO_PACKAGE check Leon Romanovsky
2020-03-01 14:44 ` [PATCH net-next 06/23] net/cavium: Clean driver versions 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-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 ` Leon Romanovsky [this message]
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 ` [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 ` [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-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-18-leon@kernel.org \
--to=leon@kernel.org \
--cc=ajit.khaparde@broadcom.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=leonro@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=sathya.perla@broadcom.com \
--cc=somnath.kotur@broadcom.com \
--cc=sriharsha.basavapatna@broadcom.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).