[4/5] drivers: remove config prefix used with make

Message ID 20201022220525.1532249-5-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series cleanup comments and logs about config options |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Thomas Monjalon Oct. 22, 2020, 10:05 p.m. UTC
  The config options CONFIG_RTE_* are simple RTE_* defines with meson.
Now that make support is dropped, update the names in log and comments.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 drivers/net/bnxt/bnxt_ethdev.c     | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c     | 2 +-
 drivers/net/sfc/sfc_ef10_essb_rx.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
  

Comments

Ajit Khaparde Oct. 22, 2020, 10:10 p.m. UTC | #1
On Thu, Oct 22, 2020 at 3:05 PM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> The config options CONFIG_RTE_* are simple RTE_* defines with meson.
> Now that make support is dropped, update the names in log and comments.
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
For bnxt PMD,
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

> ---
>  drivers/net/bnxt/bnxt_ethdev.c     | 2 +-
>  drivers/net/ixgbe/ixgbe_rxtx.c     | 2 +-
>  drivers/net/sfc/sfc_ef10_essb_rx.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index 32318cfd00..1c7d1b758d 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -1255,7 +1255,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
>
>         if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) {
>                 PMD_DRV_LOG(ERR,
> -                       "RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
> +                       "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
>                         bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
>         }
>
> diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
> index d1d3baff90..5f19972031 100644
> --- a/drivers/net/ixgbe/ixgbe_rxtx.c
> +++ b/drivers/net/ixgbe/ixgbe_rxtx.c
> @@ -5920,7 +5920,7 @@ ixgbe_config_rss_filter(struct rte_eth_dev *dev,
>         return 0;
>  }
>
> -/* Stubs needed for linkage when CONFIG_RTE_ARCH_PPC_64 is set */
> +/* Stubs needed for linkage when RTE_ARCH_PPC_64 is set */
>  #if defined(RTE_ARCH_PPC_64)
>  int
>  ixgbe_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev)
> diff --git a/drivers/net/sfc/sfc_ef10_essb_rx.c b/drivers/net/sfc/sfc_ef10_essb_rx.c
> index 17e4c140f5..97c81c8233 100644
> --- a/drivers/net/sfc/sfc_ef10_essb_rx.c
> +++ b/drivers/net/sfc/sfc_ef10_essb_rx.c
> @@ -47,7 +47,7 @@
>   * Each HW Rx descriptor has many Rx buffers. The number of buffers
>   * in one HW Rx descriptor is equal to size of contiguous block
>   * provided by Rx buffers memory pool. The contiguous block size
> - * depends on CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB and rte_mbuf
> + * depends on RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB and rte_mbuf
>   * data size specified on the memory pool creation. Typical rte_mbuf
>   * data size is about 2k which makes a bit less than 32 buffers in
>   * contiguous block with default bucket size equal to 64k.
> --
> 2.28.0
>
  
Wang, Haiyue Oct. 23, 2020, 1:55 a.m. UTC | #2
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Friday, October 23, 2020 06:05
> To: dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; david.marchand@redhat.com; Richardson, Bruce
> <bruce.richardson@intel.com>; Burakov, Anatoly <anatoly.burakov@intel.com>; olivier.matz@6wind.com;
> Power, Ciara <ciara.power@intel.com>; akhil.goyal@nxp.com; Trahe, Fiona <fiona.trahe@intel.com>;
> Griffin, John <john.griffin@intel.com>; Jain, Deepak K <deepak.k.jain@intel.com>; Ajit Khaparde
> <ajit.khaparde@broadcom.com>; Somnath Kotur <somnath.kotur@broadcom.com>; Guo, Jia <jia.guo@intel.com>;
> Wang, Haiyue <haiyue.wang@intel.com>; Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Subject: [PATCH 4/5] drivers: remove config prefix used with make
> 
> The config options CONFIG_RTE_* are simple RTE_* defines with meson.
> Now that make support is dropped, update the names in log and comments.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
>  drivers/net/bnxt/bnxt_ethdev.c     | 2 +-
>  drivers/net/ixgbe/ixgbe_rxtx.c     | 2 +-

For ixgbe PMD

Acked-by: Haiyue Wang <haiyue.wang@intel.com>

>  drivers/net/sfc/sfc_ef10_essb_rx.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 2.28.0
  
Andrew Rybchenko Oct. 23, 2020, 6:47 a.m. UTC | #3
On 10/23/20 1:05 AM, Thomas Monjalon wrote:
> The config options CONFIG_RTE_* are simple RTE_* defines with meson.
> Now that make support is dropped, update the names in log and comments.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
  

Patch

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 32318cfd00..1c7d1b758d 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1255,7 +1255,7 @@  static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
 	if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) {
 		PMD_DRV_LOG(ERR,
-			"RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
+			"RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
 			bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
 	}
 
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index d1d3baff90..5f19972031 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -5920,7 +5920,7 @@  ixgbe_config_rss_filter(struct rte_eth_dev *dev,
 	return 0;
 }
 
-/* Stubs needed for linkage when CONFIG_RTE_ARCH_PPC_64 is set */
+/* Stubs needed for linkage when RTE_ARCH_PPC_64 is set */
 #if defined(RTE_ARCH_PPC_64)
 int
 ixgbe_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev)
diff --git a/drivers/net/sfc/sfc_ef10_essb_rx.c b/drivers/net/sfc/sfc_ef10_essb_rx.c
index 17e4c140f5..97c81c8233 100644
--- a/drivers/net/sfc/sfc_ef10_essb_rx.c
+++ b/drivers/net/sfc/sfc_ef10_essb_rx.c
@@ -47,7 +47,7 @@ 
  * Each HW Rx descriptor has many Rx buffers. The number of buffers
  * in one HW Rx descriptor is equal to size of contiguous block
  * provided by Rx buffers memory pool. The contiguous block size
- * depends on CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB and rte_mbuf
+ * depends on RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB and rte_mbuf
  * data size specified on the memory pool creation. Typical rte_mbuf
  * data size is about 2k which makes a bit less than 32 buffers in
  * contiguous block with default bucket size equal to 64k.