From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C373AC35679 for ; Mon, 24 Feb 2020 08:53:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F30524670 for ; Mon, 24 Feb 2020 08:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582534439; bh=37/VfX90SYRgo0X3fn3puTaR0q9+B/0ZUmAMQ4o4YO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W/ZjeMSUk49lhCx1++4TO4m60EUOd7cJmJme9FyyG42PUVH3SeEAWoR0LykItWsxO 4mxdG3s46EmCZq+Ob1yHVABDCOWIztEqI4Lt/4JTjIL0ZyXz5YiIejbicTSn1KnHBb D2bmzy/TgSNF0PIpchRunn5Z9DnW00nSIjFHvZYY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727797AbgBXIx5 (ORCPT ); Mon, 24 Feb 2020 03:53:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:37360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727256AbgBXIx4 (ORCPT ); Mon, 24 Feb 2020 03:53:56 -0500 Received: from localhost (unknown [213.57.247.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7DF0720863; Mon, 24 Feb 2020 08:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582534435; bh=37/VfX90SYRgo0X3fn3puTaR0q9+B/0ZUmAMQ4o4YO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2Gr+ijXjbKg1q+7P8r6EQtRur7LaR8YsHtoC0Pu5vzVhS/RwO81eefSR34ioxkDZl QetGUIN3JZm7UnjIariI/kJT69aOw/EzYXxnZc4WT4TZpI/QpqCNTrnxDE/hyisGtd siBieadIneFnVu4cW5B0xsVxGTOJF++udJLZOoFA= From: Leon Romanovsky To: "David S. Miller" , Jakub Kicinski Cc: Leon Romanovsky , Tom Lendacky , Keyur Chudgar , Don Fry , Veaceslav Falico , Jay Vosburgh , linux-acenic@sunsite.dk, Maxime Ripard , Heiko Stuebner , Mark Einon , Chris Snook , linux-rockchip@lists.infradead.org, Iyappan Subramanian , Igor Russkikh , David Dillow , Netanel Belgazal , Quan Nguyen , Jay Cliburn , Lino Sanfilippo , linux-arm-kernel@lists.infradead.org, Andreas Larsson , Andy Gospodarek , netdev@vger.kernel.org, Thor Thayer , linux-kernel@vger.kernel.org, Ion Badulescu , Arthur Kiyanovski , Jes Sorensen , nios2-dev@lists.rocketboards.org, Chen-Yu Tsai Subject: [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is aligned to the linux kernel Date: Mon, 24 Feb 2020 10:53:05 +0200 Message-Id: <20200224085311.460338-13-leon@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200224085311.460338-1-leon@kernel.org> References: <20200224085311.460338-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky 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 --- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 1 - drivers/net/ethernet/amazon/ena/ena_netdev.c | 17 ++--------------- drivers/net/ethernet/amazon/ena/ena_netdev.h | 11 ----------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c index ced1d577b62a..19262f37db84 100644 --- 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 0b2fd96b93d7..4faf81c456d8 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -49,12 +49,9 @@ #include #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 8795e0b1dc3c..74c7f10b60dd 100644 --- 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 */ -- 2.24.1