Skip to content

Commit bdf85f3

Browse files
Amit Cohendavem330
authored andcommitted
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: Amit Cohen <[email protected]> Reviewed-by: Petr Machata <[email protected]> Signed-off-by: Ido Schimmel <[email protected]> Signed-off-by: Petr Machata <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e6dbab4 commit bdf85f3

File tree

1 file changed

+5
-5
lines changed
  • drivers/net/ethernet/mellanox/mlxsw

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,8 +1476,8 @@ static int mlxsw_pci_sys_ready_wait(struct mlxsw_pci *mlxsw_pci,
14761476
return -EBUSY;
14771477
}
14781478

1479-
static int mlxsw_pci_sw_reset(struct mlxsw_pci *mlxsw_pci,
1480-
const struct pci_device_id *id)
1479+
static int
1480+
mlxsw_pci_reset(struct mlxsw_pci *mlxsw_pci, const struct pci_device_id *id)
14811481
{
14821482
struct pci_dev *pdev = mlxsw_pci->pdev;
14831483
char mrsr_pl[MLXSW_REG_MRSR_LEN];
@@ -1537,9 +1537,9 @@ static int mlxsw_pci_init(void *bus_priv, struct mlxsw_core *mlxsw_core,
15371537
if (!mbox)
15381538
return -ENOMEM;
15391539

1540-
err = mlxsw_pci_sw_reset(mlxsw_pci, mlxsw_pci->id);
1540+
err = mlxsw_pci_reset(mlxsw_pci, mlxsw_pci->id);
15411541
if (err)
1542-
goto err_sw_reset;
1542+
goto err_reset;
15431543

15441544
err = mlxsw_pci_alloc_irq_vectors(mlxsw_pci);
15451545
if (err < 0) {
@@ -1672,7 +1672,7 @@ static int mlxsw_pci_init(void *bus_priv, struct mlxsw_core *mlxsw_core,
16721672
err_query_fw:
16731673
mlxsw_pci_free_irq_vectors(mlxsw_pci);
16741674
err_alloc_irq:
1675-
err_sw_reset:
1675+
err_reset:
16761676
mbox_put:
16771677
mlxsw_cmd_mbox_free(mbox);
16781678
return err;

0 commit comments

Comments
 (0)