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 14/16] net/aquantia: Delete module version
Date: Thu, 20 Feb 2020 16:58:53 +0200 [thread overview]
Message-ID: <20200220145855.255704-15-leon@kernel.org> (raw)
In-Reply-To: <20200220145855.255704-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
There is no need to keep module and driver versions in in-tree
kernel code.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 4 ----
drivers/net/ethernet/aquantia/atlantic/aq_common.h | 1 -
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c | 1 -
drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 -
drivers/net/ethernet/aquantia/atlantic/ver.h | 12 ------------
5 files changed, 19 deletions(-)
delete mode 100644 drivers/net/ethernet/aquantia/atlantic/ver.h
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
index f0c41f7408e5..7560f5506e55 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
@@ -9,8 +9,6 @@
#ifndef AQ_CFG_H
#define AQ_CFG_H
-#include <generated/utsrelease.h>
-
#define AQ_CFG_VECS_DEF 8U
#define AQ_CFG_TCS_DEF 1U
@@ -85,7 +83,5 @@
#define AQ_CFG_DRV_AUTHOR "aQuantia"
#define AQ_CFG_DRV_DESC "aQuantia Corporation(R) Network Driver"
#define AQ_CFG_DRV_NAME "atlantic"
-#define AQ_CFG_DRV_VERSION UTS_RELEASE \
- AQ_CFG_DRV_VERSION_SUFFIX
#endif /* AQ_CFG_H */
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_common.h b/drivers/net/ethernet/aquantia/atlantic/aq_common.h
index 42ea8d8daa46..c8c402b013bb 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_common.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_common.h
@@ -12,7 +12,6 @@
#include <linux/etherdevice.h>
#include <linux/pci.h>
#include <linux/if_vlan.h>
-#include "ver.h"
#include "aq_cfg.h"
#include "aq_utils.h"
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
index a1f99bef4a68..5d043ea52551 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -132,7 +132,6 @@ static void aq_ethtool_get_drvinfo(struct net_device *ndev,
regs_count = aq_nic_get_regs_count(aq_nic);
strlcat(drvinfo->driver, AQ_CFG_DRV_NAME, sizeof(drvinfo->driver));
- strlcat(drvinfo->version, AQ_CFG_DRV_VERSION, sizeof(drvinfo->version));
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
"%u.%u.%u", firmware_version >> 24,
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
index 538f460a3da7..9fcab646cbd5 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
@@ -19,7 +19,6 @@
#include <linux/udp.h>
MODULE_LICENSE("GPL v2");
-MODULE_VERSION(AQ_CFG_DRV_VERSION);
MODULE_AUTHOR(AQ_CFG_DRV_AUTHOR);
MODULE_DESCRIPTION(AQ_CFG_DRV_DESC);
diff --git a/drivers/net/ethernet/aquantia/atlantic/ver.h b/drivers/net/ethernet/aquantia/atlantic/ver.h
deleted file mode 100644
index 597654b51e01..000000000000
--- a/drivers/net/ethernet/aquantia/atlantic/ver.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved
- */
-
-#ifndef VER_H
-#define VER_H
-
-#define AQ_CFG_DRV_VERSION_SUFFIX "-kern"
-
-#endif /* VER_H */
--
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 ` [PATCH net-next 13/16] net/apm: Remove useless driver version and properly mark lack of FW Leon Romanovsky
2020-02-20 14:58 ` Leon Romanovsky [this message]
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-15-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 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.