From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A1BCA034F; Thu, 29 Jul 2021 15:48:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A7AF541141; Thu, 29 Jul 2021 15:47:49 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id DF59141100 for ; Thu, 29 Jul 2021 15:47:45 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id u15so3780624wmj.1 for ; Thu, 29 Jul 2021 06:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x2bjBHtwXowhlWA/Y7QcPOFSIxU5usmaZv95I8yrjeE=; b=vZiW2SmDOFbOmhoqiZ+Bc5B6B1nVAok/I5C0vMOUm2c+zOGvv715Wyig0a1/+BrJM+ LOsykyZ05793ewGM/YJ4Ts16OOSDW1Pe4NjKopVUByO6PdAqwKfxglpU0ndIWIfWqpVF Pv/1LexSdUbK3NZEFsdIkq8LB4YyuqPv0ok+PuY47yIKwa2d5o6HXSiEy0W0iMrpJLDL pM8YqD9hf+pf5alp4Boz08iJOy/wNf+YpFzB+UbbDcC/wznaxSVVMsa9a1uPBE1Sd/Gv 8DSN7GEXPOUhz1pitJgbd3hiOJcP/7drg2dSZKRpQED/PW0dC65uvt5ZvN30mQd8RE2z HTrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x2bjBHtwXowhlWA/Y7QcPOFSIxU5usmaZv95I8yrjeE=; b=VGbShdBRGpFhqcsVBqMF7J3nOE8RZHFVTsTS/dNPLdLDTSS0usvXPGxRfk2NRxGSGY mLGtrWANpd7mbB8Un+xz11yYc4D7sx9+cDzTySemvgsCK35kHIRoYuOGVpCFE/1OiNQa kGGRNzifojF9INig2eOzmRQ4prPeLA/VMzyDc9Qa8JGn6R1IR8bxwwt1B51zFMPgRR/I ouoydPt/LJvrtOodzfp/mmhifLapPi6CYQxhHbwuf2un19ryoOxFdNUTs2tpny/Mm7Q1 Fy3YiE9xAlIHnaUd3SZc9XIdgtrhgoJXdVELP2NO8opjOhtolt6NLIjxgkyfF1vyAaiV sn6g== X-Gm-Message-State: AOAM531kteFTaCF1uDfy9J5PDnGgPY7CM/602yJnmws72+YWaXU3EB6L owwrMkFmdzsvVmbHLP0f/EVcXdaSiVVu6jY9o/Z4EiCI8zQsR/n/ld8l7yrDtEdHVSXOMqGMUVW LRqVLbXhg1DcJ1Z/all8wPNFDozPdf3EZTVucBQetlUTAMRB1NWPLb3ZlyY05q/Wu X-Google-Smtp-Source: ABdhPJxCfZw68ZsTViPZ9cu2lZZ8UOGY9xxBRjJc/rNs0hFlWsD7ldSl3Kg4KlOMao4JkciPLOVI5g== X-Received: by 2002:a7b:c5d8:: with SMTP id n24mr4904161wmk.51.1627566465521; Thu, 29 Jul 2021 06:47:45 -0700 (PDT) Received: from localhost.localdomain (dsl-197-245-41-228.voxdsl.co.za. [197.245.41.228]) by smtp.gmail.com with ESMTPSA id v2sm3498246wro.48.2021.07.29.06.47.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jul 2021 06:47:45 -0700 (PDT) From: Heinrich Kuhn To: dev@dpdk.org Cc: Heinrich Kuhn , Simon Horman Date: Thu, 29 Jul 2021 15:47:11 +0200 Message-Id: <20210729134711.35870-8-heinrich.kuhn@netronome.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210729134711.35870-1-heinrich.kuhn@netronome.com> References: <20210716083545.34444-1-heinrich.kuhn@netronome.com> <20210729134711.35870-1-heinrich.kuhn@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 7/7] net/nfp: batch file rename for consistency X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Rename the nfp_net.c file to nfp_common as it now contains functions common to VF and PF functionality. Rename the header file too to be consistent. Also remove the "net" naming from the _ctrl and _logs files for consistency across the PMD. Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman --- drivers/net/nfp/meson.build | 2 +- drivers/net/nfp/{nfp_net.c => nfp_common.c} | 4 ++-- drivers/net/nfp/{nfp_net_pmd.h => nfp_common.h} | 6 +++--- drivers/net/nfp/nfp_cpp_bridge.c | 2 +- drivers/net/nfp/{nfp_net_ctrl.h => nfp_ctrl.h} | 6 +++--- drivers/net/nfp/nfp_ethdev.c | 6 +++--- drivers/net/nfp/nfp_ethdev_vf.c | 6 +++--- drivers/net/nfp/{nfp_net_logs.h => nfp_logs.h} | 6 +++--- drivers/net/nfp/nfp_rxtx.c | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) rename drivers/net/nfp/{nfp_net.c => nfp_common.c} (99%) rename drivers/net/nfp/{nfp_net_pmd.h => nfp_common.h} (99%) rename drivers/net/nfp/{nfp_net_ctrl.h => nfp_ctrl.h} (99%) rename drivers/net/nfp/{nfp_net_logs.h => nfp_logs.h} (94%) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index ab64d0cac3..810f02ae5b 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -18,7 +18,7 @@ sources = files( 'nfpcore/nfp_mutex.c', 'nfpcore/nfp_nsp_eth.c', 'nfpcore/nfp_hwinfo.c', - 'nfp_net.c', + 'nfp_common.c', 'nfp_rxtx.c', 'nfp_cpp_bridge.c', 'nfp_ethdev_vf.c', diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_common.c similarity index 99% rename from drivers/net/nfp/nfp_net.c rename to drivers/net/nfp/nfp_common.c index a6097eaab0..87e8f5f333 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_common.c @@ -8,9 +8,9 @@ /* * vim:shiftwidth=8:noexpandtab * - * @file dpdk/pmd/nfp_net.c + * @file dpdk/pmd/nfp_common.c * - * Netronome vNIC DPDK Poll-Mode Driver: Main entry point + * Netronome vNIC DPDK Poll-Mode Driver: Common files */ #include diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_common.h similarity index 99% rename from drivers/net/nfp/nfp_net_pmd.h rename to drivers/net/nfp/nfp_common.h index dc05e888df..54ac937bd2 100644 --- a/drivers/net/nfp/nfp_net_pmd.h +++ b/drivers/net/nfp/nfp_common.h @@ -11,8 +11,8 @@ * Netronome NFP_NET PMD driver */ -#ifndef _NFP_NET_PMD_H_ -#define _NFP_NET_PMD_H_ +#ifndef _NFP_COMMON_H_ +#define _NFP_COMMON_H_ #define NFP_NET_PMD_VERSION "0.1" #define PCI_VENDOR_ID_NETRONOME 0x19ee @@ -404,7 +404,7 @@ int nfp_net_rss_config_default(struct rte_eth_dev *dev); #define NFP_NET_DEV_PRIVATE_TO_PF(dev_priv)\ (((struct nfp_net_hw *)dev_priv)->pf_dev) -#endif /* _NFP_NET_PMD_H_ */ +#endif /* _NFP_COMMON_H_ */ /* * Local variables: * c-file-style: "Linux" diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c index d916793338..74a0eacb3f 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.c +++ b/drivers/net/nfp/nfp_cpp_bridge.c @@ -19,7 +19,7 @@ #include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_nsp.h" -#include "nfp_net_logs.h" +#include "nfp_logs.h" #include "nfp_cpp_bridge.h" #include diff --git a/drivers/net/nfp/nfp_net_ctrl.h b/drivers/net/nfp/nfp_ctrl.h similarity index 99% rename from drivers/net/nfp/nfp_net_ctrl.h rename to drivers/net/nfp/nfp_ctrl.h index 4f26ccf483..4dd62ef194 100644 --- a/drivers/net/nfp/nfp_net_ctrl.h +++ b/drivers/net/nfp/nfp_ctrl.h @@ -8,8 +8,8 @@ * * Netronome network device driver: Control BAR layout */ -#ifndef _NFP_NET_CTRL_H_ -#define _NFP_NET_CTRL_H_ +#ifndef _NFP_CTRL_H_ +#define _NFP_CTRL_H_ /* * Configuration BAR size. @@ -317,7 +317,7 @@ /* PF multiport offset */ #define NFP_PF_CSR_SLICE_SIZE (32 * 1024) -#endif /* _NFP_NET_CTRL_H_ */ +#endif /* _NFP_CTRL_H_ */ /* * Local variables: * c-file-style: "Linux" diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 056d962306..dbdac413ae 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -31,10 +31,10 @@ #include "nfpcore/nfp_rtsym.h" #include "nfpcore/nfp_nsp.h" -#include "nfp_net_pmd.h" +#include "nfp_common.h" #include "nfp_rxtx.h" -#include "nfp_net_logs.h" -#include "nfp_net_ctrl.h" +#include "nfp_logs.h" +#include "nfp_ctrl.h" #include "nfp_cpp_bridge.h" diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 223142c0ed..b697b55865 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -16,10 +16,10 @@ #include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_rtsym.h" -#include "nfp_net_pmd.h" +#include "nfp_common.h" #include "nfp_rxtx.h" -#include "nfp_net_logs.h" -#include "nfp_net_ctrl.h" +#include "nfp_logs.h" +#include "nfp_ctrl.h" static void nfp_netvf_read_mac(struct nfp_net_hw *hw); static int nfp_netvf_start(struct rte_eth_dev *dev); diff --git a/drivers/net/nfp/nfp_net_logs.h b/drivers/net/nfp/nfp_logs.h similarity index 94% rename from drivers/net/nfp/nfp_net_logs.h rename to drivers/net/nfp/nfp_logs.h index 27dd87611b..bd5a5e1ec5 100644 --- a/drivers/net/nfp/nfp_net_logs.h +++ b/drivers/net/nfp/nfp_logs.h @@ -3,8 +3,8 @@ * All rights reserved. */ -#ifndef _NFP_NET_LOGS_H_ -#define _NFP_NET_LOGS_H_ +#ifndef _NFP_LOGS_H_ +#define _NFP_LOGS_H_ #include @@ -44,4 +44,4 @@ extern int nfp_logtype_driver; rte_log(RTE_LOG_ ## level, nfp_logtype_driver, \ "%s(): " fmt "\n", __func__, ## args) -#endif /* _NFP_NET_LOGS_H_ */ +#endif /* _NFP_LOGS_H_ */ diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 9ee9e5c9a3..1402c5f84a 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -16,10 +16,10 @@ #include #include -#include "nfp_net_pmd.h" +#include "nfp_common.h" #include "nfp_rxtx.h" -#include "nfp_net_logs.h" -#include "nfp_net_ctrl.h" +#include "nfp_logs.h" +#include "nfp_ctrl.h" /* Prototypes */ static int nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq); -- 2.30.1 (Apple Git-130)