From patchwork Sun Apr 19 14:18:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 221018 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 1B288C38A30 for ; Sun, 19 Apr 2020 14:19:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4A3F21841 for ; Sun, 19 Apr 2020 14:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587305954; bh=eMAahVBSz8d5aaCU1X5EriaX5AXtMKr9e1XqHQzajYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nQ7Acto2pc19J1g948N7uoVomZFVV3Nyuay8myYoDOj77biRRNQT2gEG3JZNUd5TT VdHeABm9Mf9SDtx98gTorUmjwhEX1mpzgPJsDH232dH2oHoWuHLmRoXdlMZmhC/1f5 2FDB4nHsATu2iL6QZD46ebcJjxUbzIrTrocIZsWE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726385AbgDSOTN (ORCPT ); Sun, 19 Apr 2020 10:19:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725905AbgDSOTL (ORCPT ); Sun, 19 Apr 2020 10:19:11 -0400 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 3787021D94; Sun, 19 Apr 2020 14:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587305950; bh=eMAahVBSz8d5aaCU1X5EriaX5AXtMKr9e1XqHQzajYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PzmzhbzItK6mB4CuAKhoaee/syZM/E3kHXSejWUJKRa8grd42Rg/hIu005KOMrEj8 SeKXX7heEvmjhcCkk93MpFfshTQ45zkAObnmCI7aCL/Y32tU5L7zkJCHUOb0PmVpf3 cMJEZrWiRVvQAKFoFNLSdP7bqtSr3qTkstX0OqcM= From: Leon Romanovsky To: "David S. Miller" , Jakub Kicinski Cc: Leon Romanovsky , Borislav Petkov , netdev@vger.kernel.org, oss-drivers@netronome.com Subject: [PATCH net-next v2 3/4] net/nfp: Update driver to use global kernel version Date: Sun, 19 Apr 2020 17:18:49 +0300 Message-Id: <20200419141850.126507-4-leon@kernel.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200419141850.126507-1-leon@kernel.org> References: <20200419141850.126507-1-leon@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky Change nfp driver to use globally defined kernel version. Reported-by: Borislav Petkov Acked-by: Jakub Kicinski Signed-off-by: Leon Romanovsky --- drivers/net/ethernet/netronome/nfp/nfp_main.c | 3 --- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 -- 2 files changed, 5 deletions(-) -- 2.25.2 diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c index 4d282fc56009..7ff2ccbd43b0 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -31,7 +30,6 @@ #include "nfp_net.h" static const char nfp_driver_name[] = "nfp"; -const char nfp_driver_version[] = VERMAGIC_STRING; static const struct pci_device_id nfp_pci_device_ids[] = { { PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000, @@ -920,4 +918,3 @@ MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw"); MODULE_AUTHOR("Netronome Systems "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver."); -MODULE_VERSION(UTS_RELEASE); diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c index 2779f1526d1e..a5aa3219d112 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -203,8 +203,6 @@ nfp_get_drvinfo(struct nfp_app *app, struct pci_dev *pdev, char nsp_version[ETHTOOL_FWVERS_LEN] = {}; strlcpy(drvinfo->driver, pdev->driver->name, sizeof(drvinfo->driver)); - strlcpy(drvinfo->version, nfp_driver_version, sizeof(drvinfo->version)); - nfp_net_get_nspinfo(app, nsp_version); snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%s %s %s %s", vnic_version, nsp_version,