net/amazon: Ensure that driver version is aligned to the linux kernel

Upstream drivers are managed inside global repository and released all
together, this ensure that driver version is the same as linux kernel,
so update amazon drivers to properly reflect it.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index 1e38930353f2726b3d01c04b77445306c03b1eb2..868265a2ec00a88ba10925d22712f36c5070035a 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -404,7 +404,6 @@ static void ena_get_drvinfo(struct net_device *dev,
        struct ena_adapter *adapter = netdev_priv(dev);
 
        strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
-       strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
        strlcpy(info->bus_info, pci_name(adapter->pdev),
                sizeof(info->bus_info));
 }

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 0b2fd96b93d7f23e71d8fe599d2bb4503f01cd73..4faf81c456d803d062a3e22ee88ac15b064b19ca 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -49,12 +49,9 @@
 #include <linux/bpf_trace.h>
 #include "ena_pci_id_tbl.h"
 
-static char version[] = DEVICE_NAME " v" DRV_MODULE_VERSION "\n";
-
 MODULE_AUTHOR("Amazon.com, Inc. or its affiliates");
 MODULE_DESCRIPTION(DEVICE_NAME);
 MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_MODULE_VERSION);
 
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT  (5 * HZ)
@@ -3093,11 +3090,7 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev,
        host_info->os_dist = 0;
        strncpy(host_info->os_dist_str, utsname()->release,
                sizeof(host_info->os_dist_str) - 1);
-       host_info->driver_version =
-               (DRV_MODULE_VER_MAJOR) |
-               (DRV_MODULE_VER_MINOR << ENA_ADMIN_HOST_INFO_MINOR_SHIFT) |
-               (DRV_MODULE_VER_SUBMINOR << ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT) |
-               ("K"[0] << ENA_ADMIN_HOST_INFO_MODULE_TYPE_SHIFT);
+       host_info->driver_version = LINUX_VERSION_CODE;
        host_info->num_cpus = num_online_cpus();
 
        host_info->driver_supported_features =
@@ -3476,9 +3469,7 @@ static int ena_restore_device(struct ena_adapter *adapter)
                netif_carrier_on(adapter->netdev);
 
        mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
-       dev_err(&pdev->dev,
-               "Device reset completed successfully, Driver info: %s\n",
-               version);
+       dev_err(&pdev->dev, "Device reset completed successfully\n");
 
        return rc;
 err_disable_msix:
@@ -4116,8 +4107,6 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        dev_dbg(&pdev->dev, "%s\n", __func__);
 
-       dev_info_once(&pdev->dev, "%s", version);
-
        rc = pci_enable_device_mem(pdev);
        if (rc) {
                dev_err(&pdev->dev, "pci_enable_device_mem() failed!\n");
@@ -4429,8 +4418,6 @@ static struct pci_driver ena_pci_driver = {
 
 static int __init ena_init(void)
 {
-       pr_info("%s", version);
-
        ena_wq = create_singlethread_workqueue(DRV_MODULE_NAME);
        if (!ena_wq) {
                pr_err("Failed to create workqueue\n");

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 8795e0b1dc3c0522c67c3978125be788d60b852e..74c7f10b60dd2bb93e9288ea8024c0c11b2ac733 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -45,18 +45,7 @@
 #include "ena_com.h"
 #include "ena_eth_com.h"
 
-#define DRV_MODULE_VER_MAJOR   2
-#define DRV_MODULE_VER_MINOR   1
-#define DRV_MODULE_VER_SUBMINOR 0
-
 #define DRV_MODULE_NAME                "ena"
-#ifndef DRV_MODULE_VERSION
-#define DRV_MODULE_VERSION \
-       __stringify(DRV_MODULE_VER_MAJOR) "."   \
-       __stringify(DRV_MODULE_VER_MINOR) "."   \
-       __stringify(DRV_MODULE_VER_SUBMINOR) "K"
-#endif
-
 #define DEVICE_NAME    "Elastic Network Adapter (ENA)"
 
 /* 1 for AENQ + ADMIN */