ionic: drop ethtool driver version

Use the default kernel version in ethtool drv_info output
and drop the module version.

Cc: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
index 59f8385d591f70907e07ce3ac725f6c3b9528075..23ccc0da2341a7327cd77914504df93ce42bc94b 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic.h
@@ -12,7 +12,6 @@ struct ionic_lif;
 
 #define IONIC_DRV_NAME         "ionic"
 #define IONIC_DRV_DESCRIPTION  "Pensando Ethernet NIC Driver"
-#define IONIC_DRV_VERSION      "0.20.0-k"
 
 #define PCI_VENDOR_ID_PENSANDO                 0x1dd8
 

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
index de57b415a527fcf7a8aaf589c1f5d6f1c0cc747d..a233716eac29bf6c1e1472be83a4c3da13ad1d17 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
@@ -86,7 +86,6 @@ static void ionic_get_drvinfo(struct net_device *netdev,
        struct ionic *ionic = lif->ionic;
 
        strlcpy(drvinfo->driver, IONIC_DRV_NAME, sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, IONIC_DRV_VERSION, sizeof(drvinfo->version));
        strlcpy(drvinfo->fw_version, ionic->idev.dev_info.fw_version,
                sizeof(drvinfo->fw_version));
        strlcpy(drvinfo->bus_info, ionic_bus_info(ionic),

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
index a8e3fb73b465052d1119c29609ec3b92f5a354fc..e4a76e66f5426444bcf324d19a0a38b6c131537a 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
@@ -6,6 +6,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/utsname.h>
+#include <linux/vermagic.h>
 
 #include "ionic.h"
 #include "ionic_bus.h"
@@ -15,7 +16,6 @@
 MODULE_DESCRIPTION(IONIC_DRV_DESCRIPTION);
 MODULE_AUTHOR("Pensando Systems, Inc");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(IONIC_DRV_VERSION);
 
 static const char *ionic_error_to_str(enum ionic_status_code code)
 {
@@ -414,7 +414,7 @@ int ionic_identify(struct ionic *ionic)
        memset(ident, 0, sizeof(*ident));
 
        ident->drv.os_type = cpu_to_le32(IONIC_OS_TYPE_LINUX);
-       strncpy(ident->drv.driver_ver_str, IONIC_DRV_VERSION,
+       strncpy(ident->drv.driver_ver_str, UTS_RELEASE,
                sizeof(ident->drv.driver_ver_str) - 1);
 
        mutex_lock(&ionic->dev_cmd_lock);
@@ -558,8 +558,6 @@ int ionic_port_reset(struct ionic *ionic)
 
 static int __init ionic_init_module(void)
 {
-       pr_info("%s %s, ver %s\n",
-               IONIC_DRV_NAME, IONIC_DRV_DESCRIPTION, IONIC_DRV_VERSION);
        ionic_debugfs_create();
        return ionic_bus_register_driver();
 }