mlxsw: Rename 'read_frc_capable' bit to 'read_clock_capable'

Rename the 'read_frc_capable' bit to 'read_clock_capable' since now it can
be both the FRC and UTC clocks.

Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
index 6b05586052dd8a0ccf1070273de70e34a8a3a429..9d2e8a8d3a7567d30c29d4ef7212f19083c4e0a2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -487,7 +487,7 @@ struct mlxsw_bus_info {
        u8 vsd[MLXSW_CMD_BOARDINFO_VSD_LEN];
        u8 psid[MLXSW_CMD_BOARDINFO_PSID_LEN];
        u8 low_frequency:1,
-          read_frc_capable:1;
+          read_clock_capable:1;
 };
 
 struct mlxsw_hwmon;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 57792e87dee2b540bd2aa1fcbc3299822e2fdeea..0f452c8dabbd50eb26ff3746ad6aa93e27fb817a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -1923,7 +1923,7 @@ static int mlxsw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        mlxsw_pci->bus_info.device_kind = driver_name;
        mlxsw_pci->bus_info.device_name = pci_name(mlxsw_pci->pdev);
        mlxsw_pci->bus_info.dev = &pdev->dev;
-       mlxsw_pci->bus_info.read_frc_capable = true;
+       mlxsw_pci->bus_info.read_clock_capable = true;
        mlxsw_pci->id = id;
 
        err = mlxsw_core_bus_device_register(&mlxsw_pci->bus_info,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index bd7552e8dd5cfee105552789d8a3e484e09b2f18..641078060b02d6dd06acde2d5d15f62b84b20f3c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3096,7 +3096,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core,
                goto err_router_init;
        }
 
-       if (mlxsw_sp->bus_info->read_frc_capable) {
+       if (mlxsw_sp->bus_info->read_clock_capable) {
                /* NULL is a valid return value from clock_init */
                mlxsw_sp->clock =
                        mlxsw_sp->ptp_ops->clock_init(mlxsw_sp,