From: Leon Romanovsky <leon@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Leon Romanovsky <leonro@mellanox.com>,
linux-netdev <netdev@vger.kernel.org>
Subject: [PATCH net-next 13/16] net/apm: Remove useless driver version and properly mark lack of FW
Date: Thu, 20 Feb 2020 16:58:52 +0200 [thread overview]
Message-ID: <20200220145855.255704-14-leon@kernel.org> (raw)
In-Reply-To: <20200220145855.255704-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
Delete module version in favor of global and unique linux kernel.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/net/ethernet/apm/xgene-v2/ethtool.c | 2 --
drivers/net/ethernet/apm/xgene-v2/main.c | 1 -
drivers/net/ethernet/apm/xgene-v2/main.h | 1 -
drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c | 2 --
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 1 -
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 -
6 files changed, 8 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene-v2/ethtool.c b/drivers/net/ethernet/apm/xgene-v2/ethtool.c
index a58250c1b57a..b78d1a99fe81 100644
--- a/drivers/net/ethernet/apm/xgene-v2/ethtool.c
+++ b/drivers/net/ethernet/apm/xgene-v2/ethtool.c
@@ -89,8 +89,6 @@ static void xge_get_drvinfo(struct net_device *ndev,
struct platform_device *pdev = pdata->pdev;
strcpy(info->driver, "xgene-enet-v2");
- strcpy(info->version, XGENE_ENET_V2_VERSION);
- snprintf(info->fw_version, ETHTOOL_FWVERS_LEN, "N/A");
sprintf(info->bus_info, "%s", pdev->name);
}
diff --git a/drivers/net/ethernet/apm/xgene-v2/main.c b/drivers/net/ethernet/apm/xgene-v2/main.c
index c48f60996761..860c18fb7aae 100644
--- a/drivers/net/ethernet/apm/xgene-v2/main.c
+++ b/drivers/net/ethernet/apm/xgene-v2/main.c
@@ -741,5 +741,4 @@ module_platform_driver(xge_driver);
MODULE_DESCRIPTION("APM X-Gene SoC Ethernet v2 driver");
MODULE_AUTHOR("Iyappan Subramanian <isubramanian@apm.com>");
-MODULE_VERSION(XGENE_ENET_V2_VERSION);
MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/apm/xgene-v2/main.h b/drivers/net/ethernet/apm/xgene-v2/main.h
index d41439d2709d..b3985a7be59d 100644
--- a/drivers/net/ethernet/apm/xgene-v2/main.h
+++ b/drivers/net/ethernet/apm/xgene-v2/main.h
@@ -28,7 +28,6 @@
#include "ring.h"
#include "ethtool.h"
-#define XGENE_ENET_V2_VERSION "v1.0"
#define XGENE_ENET_STD_MTU 1536
#define XGENE_ENET_MIN_FRAME 60
#define IRQ_ID_SIZE 16
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 246dec27140d..ada70425b48c 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -103,8 +103,6 @@ static void xgene_get_drvinfo(struct net_device *ndev,
struct platform_device *pdev = pdata->pdev;
strcpy(info->driver, "xgene_enet");
- strcpy(info->version, XGENE_DRV_VERSION);
- snprintf(info->fw_version, ETHTOOL_FWVERS_LEN, "N/A");
sprintf(info->bus_info, "%s", pdev->name);
}
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 6aee2f0fc0db..5f1fc6582d74 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -2179,7 +2179,6 @@ static struct platform_driver xgene_enet_driver = {
module_platform_driver(xgene_enet_driver);
MODULE_DESCRIPTION("APM X-Gene SoC Ethernet driver");
-MODULE_VERSION(XGENE_DRV_VERSION);
MODULE_AUTHOR("Iyappan Subramanian <isubramanian@apm.com>");
MODULE_AUTHOR("Keyur Chudgar <kchudgar@apm.com>");
MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 18f4923b1723..d35a338120cf 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -28,7 +28,6 @@
#include "xgene_enet_ring2.h"
#include "../../../phy/mdio-xgene.h"
-#define XGENE_DRV_VERSION "v1.0"
#define ETHER_MIN_PACKET 64
#define ETHER_STD_PACKET 1518
#define XGENE_ENET_STD_MTU 1536
--
2.24.1
next prev parent reply other threads:[~2020-02-20 14:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 14:58 [PATCH net-next 00/16] Clean driver, module and FW versions Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 01/16] net/bond: Delete driver and module versions Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 02/16] net/dummy: Ditch " Leon Romanovsky
2020-02-21 9:11 ` Sergei Shtylyov
2020-02-22 7:28 ` Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 03/16] net/3com: Delete driver and module versions from 3com drivers Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 04/16] net/adaptec: Clean driver versions Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 05/16] net/aeroflex: Clean ethtool_info struct assignments Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 06/16] net/agere: Delete unneeded driver version Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 07/16] net/alacritech: Delete " Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 08/16] net/allwinner: Remove " Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 09/16] net/alteon: Properly report FW version Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 10/16] net/althera: Delete hardcoded driver version Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 11/16] net/amazon: Ensure that driver version is aligned to the linux kernel Leon Romanovsky
2020-02-23 8:54 ` Gal Pressman
2020-02-23 9:10 ` Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 12/16] net/amd: Remove useless driver version Leon Romanovsky
2020-02-20 14:58 ` Leon Romanovsky [this message]
2020-02-20 14:58 ` [PATCH net-next 14/16] net/aquantia: Delete module version Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 15/16] net/arc: Delete driver version Leon Romanovsky
2020-02-20 14:58 ` [PATCH net-next 16/16] net/atheros: Clean atheros code from " Leon Romanovsky
2020-02-21 1:17 ` [PATCH net-next 00/16] Clean driver, module and FW versions Jakub Kicinski
2020-02-21 19:35 ` David Miller
2020-02-22 7:27 ` Leon Romanovsky
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=20200220145855.255704-14-leon@kernel.org \
--to=leon@kernel.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=leonro@mellanox.com \
--cc=netdev@vger.kernel.org \
/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).