diff mbox series

[v2] regex/mlx5: fix registered driver name

Message ID 20200805145101.107060-1-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Headers show
Series [v2] regex/mlx5: fix registered driver name | expand

Checks

Context Check Description
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Thomas Monjalon Aug. 5, 2020, 2:51 p.m. UTC
The driver name was registered as "net_mlx5_regex".
It is renamed as "regex_mlx5".
The same name is used in mlx5_regex_driver.pci_driver.driver.name,
instead of "mlx5_regex", for consistency.

The string used for log registration (pmd.regex.mlx5) could be derived
from the driver name. A macro is created so name definitions are close.

Fixes: cfc672a90b74 ("regex/mlx5: support probing")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v2: add macros and fix PCI driver name
---
 drivers/regex/mlx5/mlx5_regex.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Comments

Ori Kam Aug. 5, 2020, 4:35 p.m. UTC | #1
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> 
> The driver name was registered as "net_mlx5_regex".
> It is renamed as "regex_mlx5".
> The same name is used in mlx5_regex_driver.pci_driver.driver.name,
> instead of "mlx5_regex", for consistency.
> 
> The string used for log registration (pmd.regex.mlx5) could be derived
> from the driver name. A macro is created so name definitions are close.
> 
> Fixes: cfc672a90b74 ("regex/mlx5: support probing")
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> v2: add macros and fix PCI driver name
> ---
>  drivers/regex/mlx5/mlx5_regex.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/regex/mlx5/mlx5_regex.c
> b/drivers/regex/mlx5/mlx5_regex.c
> index ae9f00189e..605ebcfe0e 100644
> --- a/drivers/regex/mlx5/mlx5_regex.c
> +++ b/drivers/regex/mlx5/mlx5_regex.c
> @@ -19,6 +19,9 @@
>  #include "mlx5_regex_utils.h"
>  #include "mlx5_rxp_csrs.h"
> 
> +#define MLX5_REGEX_DRIVER_NAME regex_mlx5
> +#define MLX5_REGEX_LOG_NAME    pmd.regex.mlx5
> +
>  int mlx5_regex_logtype;
> 
>  const struct rte_regexdev_ops mlx5_regexdev_ops = {
> @@ -250,7 +253,7 @@ static struct mlx5_pci_driver mlx5_regex_driver = {
>  	.driver_class = MLX5_CLASS_REGEX,
>  	.pci_driver = {
>  		.driver = {
> -			.name = "mlx5_regex",
> +			.name = RTE_STR(MLX5_REGEX_DRIVER_NAME),
>  		},
>  		.id_table = mlx5_regex_pci_id_map,
>  		.probe = mlx5_regex_pci_probe,
> @@ -266,7 +269,7 @@ RTE_INIT(rte_mlx5_regex_init)
>  		mlx5_pci_driver_register(&mlx5_regex_driver);
>  }
> 
> -RTE_LOG_REGISTER(mlx5_regex_logtype, pmd.regex.mlx5, NOTICE)
> -RTE_PMD_EXPORT_NAME(net_mlx5_regex, __COUNTER__);
> -RTE_PMD_REGISTER_PCI_TABLE(net_mlx5_regex, mlx5_regex_pci_id_map);
> -RTE_PMD_REGISTER_KMOD_DEP(net_mlx5_regex, "* ib_uverbs & mlx5_core
> & mlx5_ib");
> +RTE_LOG_REGISTER(mlx5_regex_logtype, MLX5_REGEX_LOG_NAME,
> NOTICE)
> +RTE_PMD_EXPORT_NAME(MLX5_REGEX_DRIVER_NAME, __COUNTER__);
> +RTE_PMD_REGISTER_PCI_TABLE(MLX5_REGEX_DRIVER_NAME,
> mlx5_regex_pci_id_map);
> +RTE_PMD_REGISTER_KMOD_DEP(MLX5_REGEX_DRIVER_NAME, "* ib_uverbs
> & mlx5_core & mlx5_ib");
> --
> 2.27.0

Acked-by: Ori Kam <orika@mellanox.com>
Thanks,
Ori
Thomas Monjalon Aug. 5, 2020, 4:37 p.m. UTC | #2
> > The driver name was registered as "net_mlx5_regex".
> > It is renamed as "regex_mlx5".
> > The same name is used in mlx5_regex_driver.pci_driver.driver.name,
> > instead of "mlx5_regex", for consistency.
> > 
> > The string used for log registration (pmd.regex.mlx5) could be derived
> > from the driver name. A macro is created so name definitions are close.
> > 
> > Fixes: cfc672a90b74 ("regex/mlx5: support probing")
> > 
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > ---
> > v2: add macros and fix PCI driver name
> 
> Acked-by: Ori Kam <orika@mellanox.com>

Applied
diff mbox series

Patch

diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index ae9f00189e..605ebcfe0e 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -19,6 +19,9 @@ 
 #include "mlx5_regex_utils.h"
 #include "mlx5_rxp_csrs.h"
 
+#define MLX5_REGEX_DRIVER_NAME regex_mlx5
+#define MLX5_REGEX_LOG_NAME    pmd.regex.mlx5
+
 int mlx5_regex_logtype;
 
 const struct rte_regexdev_ops mlx5_regexdev_ops = {
@@ -250,7 +253,7 @@  static struct mlx5_pci_driver mlx5_regex_driver = {
 	.driver_class = MLX5_CLASS_REGEX,
 	.pci_driver = {
 		.driver = {
-			.name = "mlx5_regex",
+			.name = RTE_STR(MLX5_REGEX_DRIVER_NAME),
 		},
 		.id_table = mlx5_regex_pci_id_map,
 		.probe = mlx5_regex_pci_probe,
@@ -266,7 +269,7 @@  RTE_INIT(rte_mlx5_regex_init)
 		mlx5_pci_driver_register(&mlx5_regex_driver);
 }
 
-RTE_LOG_REGISTER(mlx5_regex_logtype, pmd.regex.mlx5, NOTICE)
-RTE_PMD_EXPORT_NAME(net_mlx5_regex, __COUNTER__);
-RTE_PMD_REGISTER_PCI_TABLE(net_mlx5_regex, mlx5_regex_pci_id_map);
-RTE_PMD_REGISTER_KMOD_DEP(net_mlx5_regex, "* ib_uverbs & mlx5_core & mlx5_ib");
+RTE_LOG_REGISTER(mlx5_regex_logtype, MLX5_REGEX_LOG_NAME, NOTICE)
+RTE_PMD_EXPORT_NAME(MLX5_REGEX_DRIVER_NAME, __COUNTER__);
+RTE_PMD_REGISTER_PCI_TABLE(MLX5_REGEX_DRIVER_NAME, mlx5_regex_pci_id_map);
+RTE_PMD_REGISTER_KMOD_DEP(MLX5_REGEX_DRIVER_NAME, "* ib_uverbs & mlx5_core & mlx5_ib");