net/mlx5: Remove "recovery" arg from mlx5_load_one() function
mlx5_load_one() is always called with recovery==false, so remove the unneeded function arg. Signed-off-by: Jiri Pirko <jiri@nvidia.com> Reviewed-by: Moshe Shemesh <moshe@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
This commit is contained in:
committed by
Saeed Mahameed
parent
de411a8226
commit
5977ac3910
@@ -167,7 +167,7 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev)
|
||||
if (mlx5_health_wait_pci_up(dev))
|
||||
mlx5_core_err(dev, "reset reload flow aborted, PCI reads still not working\n");
|
||||
else
|
||||
mlx5_load_one(dev, false);
|
||||
mlx5_load_one(dev);
|
||||
devlink_remote_reload_actions_performed(priv_to_devlink(dev), 0,
|
||||
BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |
|
||||
BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE));
|
||||
|
||||
@@ -1509,13 +1509,13 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
int mlx5_load_one(struct mlx5_core_dev *dev, bool recovery)
|
||||
int mlx5_load_one(struct mlx5_core_dev *dev)
|
||||
{
|
||||
struct devlink *devlink = priv_to_devlink(dev);
|
||||
int ret;
|
||||
|
||||
devl_lock(devlink);
|
||||
ret = mlx5_load_one_devl_locked(dev, recovery);
|
||||
ret = mlx5_load_one_devl_locked(dev, false);
|
||||
devl_unlock(devlink);
|
||||
return ret;
|
||||
}
|
||||
@@ -1912,8 +1912,7 @@ static void mlx5_pci_resume(struct pci_dev *pdev)
|
||||
|
||||
mlx5_pci_trace(dev, "Enter, loading driver..\n");
|
||||
|
||||
err = mlx5_load_one(dev, false);
|
||||
|
||||
err = mlx5_load_one(dev);
|
||||
if (!err)
|
||||
devlink_health_reporter_state_update(dev->priv.health.fw_fatal_reporter,
|
||||
DEVLINK_HEALTH_REPORTER_STATE_HEALTHY);
|
||||
@@ -2004,7 +2003,7 @@ static int mlx5_resume(struct pci_dev *pdev)
|
||||
{
|
||||
struct mlx5_core_dev *dev = pci_get_drvdata(pdev);
|
||||
|
||||
return mlx5_load_one(dev, false);
|
||||
return mlx5_load_one(dev);
|
||||
}
|
||||
|
||||
static const struct pci_device_id mlx5_core_pci_table[] = {
|
||||
|
||||
@@ -321,7 +321,7 @@ int mlx5_init_one(struct mlx5_core_dev *dev);
|
||||
void mlx5_uninit_one(struct mlx5_core_dev *dev);
|
||||
void mlx5_unload_one(struct mlx5_core_dev *dev);
|
||||
void mlx5_unload_one_devl_locked(struct mlx5_core_dev *dev);
|
||||
int mlx5_load_one(struct mlx5_core_dev *dev, bool recovery);
|
||||
int mlx5_load_one(struct mlx5_core_dev *dev);
|
||||
int mlx5_load_one_devl_locked(struct mlx5_core_dev *dev, bool recovery);
|
||||
|
||||
int mlx5_vport_set_other_func_cap(struct mlx5_core_dev *dev, const void *hca_cap, u16 function_id,
|
||||
|
||||
Reference in New Issue
Block a user