ionic: drop ethtool driver version (1fcbebf1) · Commits · 戴 / test

drivers/net/ethernet/pensando/ionic/ionic.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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),

+2 −4

Original line number	Diff line number	Diff line
		@@ -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();
		}