mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 07:59:42 -04:00
net/mlx5: Rename mlx5_sf_dev_remove
Mlx5 has two functions with the same name mlx5_sf_dev_remove. Both are static, in different files, so no compilation or logical issue, but it makes it hard to follow the code and some traces even can get both as one leads to the other [1]. Rename one to mlx5_sf_dev_remove_aux() as it actually removes the auxiliary device of the SF. [1] mlx5_sf_dev_remove+0x2a/0x70 [mlx5_core] auxiliary_bus_remove+0x18/0x30 device_release_driver_internal+0x199/0x200 bus_remove_device+0xd7/0x140 device_del+0x153/0x3d0 ? process_one_work+0x16a/0x4b0 mlx5_sf_dev_remove+0x2e/0x90 [mlx5_core] mlx5_sf_dev_table_destroy+0xa0/0x100 [mlx5_core] Signed-off-by: Moshe Shemesh <moshe@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
This commit is contained in:
committed by
Saeed Mahameed
parent
21e16fa5dc
commit
8d7db0abaf
@@ -74,7 +74,8 @@ static void mlx5_sf_dev_release(struct device *device)
|
||||
kfree(sf_dev);
|
||||
}
|
||||
|
||||
static void mlx5_sf_dev_remove(struct mlx5_core_dev *dev, struct mlx5_sf_dev *sf_dev)
|
||||
static void mlx5_sf_dev_remove_aux(struct mlx5_core_dev *dev,
|
||||
struct mlx5_sf_dev *sf_dev)
|
||||
{
|
||||
int id;
|
||||
|
||||
@@ -138,7 +139,7 @@ static void mlx5_sf_dev_add(struct mlx5_core_dev *dev, u16 sf_index, u16 fn_id,
|
||||
return;
|
||||
|
||||
xa_err:
|
||||
mlx5_sf_dev_remove(dev, sf_dev);
|
||||
mlx5_sf_dev_remove_aux(dev, sf_dev);
|
||||
add_err:
|
||||
mlx5_core_err(dev, "SF DEV: fail device add for index=%d sfnum=%d err=%d\n",
|
||||
sf_index, sfnum, err);
|
||||
@@ -149,7 +150,7 @@ static void mlx5_sf_dev_del(struct mlx5_core_dev *dev, struct mlx5_sf_dev *sf_de
|
||||
struct mlx5_sf_dev_table *table = dev->priv.sf_dev_table;
|
||||
|
||||
xa_erase(&table->devices, sf_index);
|
||||
mlx5_sf_dev_remove(dev, sf_dev);
|
||||
mlx5_sf_dev_remove_aux(dev, sf_dev);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -367,7 +368,7 @@ static void mlx5_sf_dev_destroy_all(struct mlx5_sf_dev_table *table)
|
||||
|
||||
xa_for_each(&table->devices, index, sf_dev) {
|
||||
xa_erase(&table->devices, index);
|
||||
mlx5_sf_dev_remove(table->dev, sf_dev);
|
||||
mlx5_sf_dev_remove_aux(table->dev, sf_dev);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user