From: Asaf Penso Date: Mon, 15 Mar 2021 21:05:55 +0000 (+0000) Subject: common/mlx5: rename definition of PCI driver name X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=188773a2ee516fb790b0787b0da13c84fc1a984c;p=dpdk.git common/mlx5: rename definition of PCI driver name The current define for MLX5_DRIVER_NAME refers specially for the PCI driver. The define itself does not mention PCI and this is confusing. Rename from MLX5_DRIVER_NAME to MLX5_PCI_DRIVER_NAME. Signed-off-by: Asaf Penso Acked-by: Viacheslav Ovsiienko --- diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h index 20feea84d1..327374fdcf 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -19,7 +19,7 @@ #include "mlx5_devx_cmds.h" /* Reported driver name. */ -#define MLX5_DRIVER_NAME "mlx5_pci" +#define MLX5_PCI_DRIVER_NAME "mlx5_pci" /* Bit-field manipulation. */ #define BITFIELD_DECLARE(bf, type, size) \ diff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c index 9689ca86fc..5a73ffa60a 100644 --- a/drivers/common/mlx5/mlx5_common_pci.c +++ b/drivers/common/mlx5/mlx5_common_pci.c @@ -415,7 +415,7 @@ static struct rte_pci_id *mlx5_pci_id_table; static struct rte_pci_driver mlx5_pci_driver = { .driver = { - .name = MLX5_DRIVER_NAME, + .name = MLX5_PCI_DRIVER_NAME, }, .probe = mlx5_common_pci_probe, .remove = mlx5_common_pci_remove, diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 3538cc8c20..9557d06afa 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -2116,7 +2116,7 @@ mlx5_eth_find_next(uint16_t port_id, struct rte_pci_device *pci_dev) (dev->device == &pci_dev->device || (dev->device->driver && dev->device->driver->name && - !strcmp(dev->device->driver->name, MLX5_DRIVER_NAME)))) + !strcmp(dev->device->driver->name, MLX5_PCI_DRIVER_NAME)))) break; port_id++; } @@ -2237,7 +2237,7 @@ static struct mlx5_pci_driver mlx5_driver = { .driver_class = MLX5_CLASS_NET, .pci_driver = { .driver = { - .name = MLX5_DRIVER_NAME, + .name = MLX5_PCI_DRIVER_NAME, }, .id_table = mlx5_pci_id_map, .probe = mlx5_os_pci_probe,