Commit bdf85f3a authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

mlxsw: pci: Rename mlxsw_pci_sw_reset() 



In the next patches, mlxsw_pci_sw_reset() will be extended to support
more reset types and will not necessarily issue a software reset. Rename
the function to reflect that.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6dbab40

drivers/net/ethernet/mellanox/mlxsw/pci.c

+5 −5
Original line number Diff line number Diff line
@@ -1476,8 +1476,8 @@ static int mlxsw_pci_sys_ready_wait(struct mlxsw_pci *mlxsw_pci, 
	return -EBUSY;

}



static int mlxsw_pci_sw_reset(struct mlxsw_pci *mlxsw_pci,

			      const struct pci_device_id *id)

static int

mlxsw_pci_reset(struct mlxsw_pci *mlxsw_pci, const struct pci_device_id *id)

{

	struct pci_dev *pdev = mlxsw_pci->pdev;

	char mrsr_pl[MLXSW_REG_MRSR_LEN];
@@ -1537,9 +1537,9 @@ static int mlxsw_pci_init(void *bus_priv, struct mlxsw_core *mlxsw_core, 
	if (!mbox)

		return -ENOMEM;



	err = mlxsw_pci_sw_reset(mlxsw_pci, mlxsw_pci->id);

	err = mlxsw_pci_reset(mlxsw_pci, mlxsw_pci->id);

	if (err)

		goto err_sw_reset;

		goto err_reset;



	err = mlxsw_pci_alloc_irq_vectors(mlxsw_pci);

	if (err < 0) {
@@ -1672,7 +1672,7 @@ static int mlxsw_pci_init(void *bus_priv, struct mlxsw_core *mlxsw_core, 
err_query_fw:

	mlxsw_pci_free_irq_vectors(mlxsw_pci);

err_alloc_irq:

err_sw_reset:

err_reset:

mbox_put:

	mlxsw_cmd_mbox_free(mbox);

	return err;