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 BCB06C3F2D1 for ; Sun, 1 Mar 2020 14:45:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9121E24677 for ; Sun, 1 Mar 2020 14:45:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583073919; bh=pd/NGsl+FJgnqBYsiZ/s5l3256lUdAtpUXAA0265xgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YBBUvihTZ2MxJ5KXZ2uoqFu3vk3ppZlsQnHUiG973K4mDoC8TdKz+usZbrwJa7Pcb 7VQAFzKsp1grR5FVg3fnahGF/GqpxTWQGb1RKvNeDrLwwYDL31ywfjdpzFCIf3MD3F V4ovvKPxjDiM4nviTcntt4bbPt88vpjw2lS8oRs0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726822AbgCAOpS (ORCPT ); Sun, 1 Mar 2020 09:45:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:52260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726103AbgCAOpR (ORCPT ); Sun, 1 Mar 2020 09:45:17 -0500 Received: from localhost (unknown [193.47.165.251]) (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 9B9D72468A; Sun, 1 Mar 2020 14:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583073917; bh=pd/NGsl+FJgnqBYsiZ/s5l3256lUdAtpUXAA0265xgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XKDyMxj9fpi3CZBT+VBarUaR0JDS4Jw7swPU+Qn0yO9rvD/jiJE5J5BnE+HnpLCp/ PDHLAC5Rx+eOrYSsK/gP6CIVQTgLaAIe5VfmWHcP3USzJ4uGcCnmv40k8iHfF82Sqe Rg3iu4Ap7KqUI67NrqriiVga2X9+2fAK/V+t4SAw= From: Leon Romanovsky To: "David S . Miller" , Jakub Kicinski Cc: Leon Romanovsky , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, Robert Richter , Sunil Goutham Subject: [PATCH net-next 06/23] net/cavium: Clean driver versions Date: Sun, 1 Mar 2020 16:44:39 +0200 Message-Id: <20200301144457.119795-7-leon@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200301144457.119795-1-leon@kernel.org> References: <20200301144457.119795-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 Delete driver and module versions in favor of global linux kernel variant. Signed-off-by: Leon Romanovsky --- drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 4 ---- drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c index e9575887a4f8..2985699ad1da 100644 --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c @@ -28,7 +28,6 @@ #include #define DRV_NAME "octeon_mgmt" -#define DRV_VERSION "2.0" #define DRV_DESCRIPTION \ "Cavium Networks Octeon MII (management) port Network Driver" @@ -1340,7 +1339,6 @@ static void octeon_mgmt_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info) { strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); strlcpy(info->bus_info, "N/A", sizeof(info->bus_info)); } @@ -1517,7 +1515,6 @@ static int octeon_mgmt_probe(struct platform_device *pdev) if (result) goto err; - dev_info(&pdev->dev, "Version " DRV_VERSION "\n"); return 0; err: @@ -1574,4 +1571,3 @@ module_exit(octeon_mgmt_mod_exit); MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_AUTHOR("David Daney"); MODULE_LICENSE("GPL"); -MODULE_VERSION(DRV_VERSION); diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c index 5e0b16bb95a0..83dabcffc789 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c @@ -16,7 +16,6 @@ #include "../common/cavium_ptp.h" #define DRV_NAME "nicvf" -#define DRV_VERSION "1.0" struct nicvf_stat { char name[ETH_GSTRING_LEN]; @@ -192,7 +191,6 @@ static void nicvf_get_drvinfo(struct net_device *netdev, struct nicvf *nic = netdev_priv(netdev); strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); strlcpy(info->bus_info, pci_name(nic->pdev), sizeof(info->bus_info)); } -- 2.24.1