From: Leon Romanovsky <leonro@mellanox.com>
To: Shannon Nelson <snelson@pensando.io>
Cc: netdev@vger.kernel.org, davem@davemloft.net
Subject: Re: [PATCH v3 net-next 8/8] ionic: drop ethtool driver version
Date: Thu, 5 Mar 2020 08:10:39 +0200 [thread overview]
Message-ID: <20200305061039.GP121803@unreal> (raw)
In-Reply-To: <20200305052319.14682-9-snelson@pensando.io>
On Wed, Mar 04, 2020 at 09:23:19PM -0800, Shannon Nelson wrote:
> 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>
> ---
> drivers/net/ethernet/pensando/ionic/ionic.h | 1 -
> drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 1 -
> drivers/net/ethernet/pensando/ionic/ionic_main.c | 6 ++----
> 3 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
> index c8ff33da243a..1c720759fd80 100644
> --- 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 acd53e27d1ec..bea9b78e0189 100644
> --- 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 a8e3fb73b465..e4a76e66f542 100644
> --- 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);
i see that you responded to my question about usage of this string [1]
and I can't say anything about netdev policy on that, but in other
subsystems, the idea that driver has duplicated debug functionalities
to the general kernel code is not welcomed.
[1] https://lore.kernel.org/netdev/e0cbc84c-7860-abf2-a622-4035be1479dc@pensando.io
>
> 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();
> }
> --
> 2.17.1
>
next prev parent reply other threads:[~2020-03-05 6:10 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 5:23 [PATCH v3 net-next 0/8] ionic updates Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 1/8] ionic: keep ionic dev on lif init fail Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 2/8] ionic: remove pragma packed Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 3/8] ionic: improve irq numa locality Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 4/8] ionic: clean up bitflag usage Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 5/8] ionic: support ethtool rxhash disable Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 6/8] ionic: print pci bus lane info Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 7/8] ionic: add support for device id 0x1004 Shannon Nelson
2020-03-05 22:03 ` Jakub Kicinski
2020-03-06 0:41 ` Shannon Nelson
2020-03-06 1:18 ` Jakub Kicinski
2020-03-06 7:43 ` Shannon Nelson
2020-03-06 18:20 ` Jakub Kicinski
2020-03-06 20:32 ` Shannon Nelson
2020-03-06 21:28 ` Jakub Kicinski
2020-03-06 22:57 ` Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 8/8] ionic: drop ethtool driver version Shannon Nelson
2020-03-05 6:10 ` Leon Romanovsky [this message]
2020-03-05 7:20 ` Shannon Nelson
2020-03-05 7:52 ` 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=20200305061039.GP121803@unreal \
--to=leonro@mellanox.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=snelson@pensando.io \
/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).