mlxsw: core: Add "eth" prefix to mlxsw_core_port_set

Since we are about to introduce IB port APIs, we will add prefixes to
existing APIs.

Signed-off-by: Elad Raz <eladr@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index b50acb1a72603a861a32e8d02c0ee90bf662118d..dcd7202dd47eb0760afe04b4de6eba31e3110a69 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -1705,9 +1705,9 @@ void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)
 }
 EXPORT_SYMBOL(mlxsw_core_port_fini);
 
-void mlxsw_core_port_set(struct mlxsw_core *mlxsw_core, u8 local_port,
-                        void *port_driver_priv, struct net_device *dev,
-                        bool split, u32 split_group)
+void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,
+                            void *port_driver_priv, struct net_device *dev,
+                            bool split, u32 split_group)
 {
        struct mlxsw_core_port *mlxsw_core_port =
                                        &mlxsw_core->ports[local_port];
@@ -1718,7 +1718,7 @@ void mlxsw_core_port_set(struct mlxsw_core *mlxsw_core, u8 local_port,
                devlink_port_split_set(devlink_port, split_group);
        devlink_port_type_eth_set(devlink_port, dev);
 }
-EXPORT_SYMBOL(mlxsw_core_port_set);
+EXPORT_SYMBOL(mlxsw_core_port_eth_set);
 
 void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port,
                           void *port_driver_priv)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
index f4bbbd485d8705d51c19519cc41c357ffa0fb56c..82866d5e23c0bd091f12ac8d0e8d1c58c43825a6 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -145,9 +145,9 @@ void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core,
 void *mlxsw_core_port_driver_priv(struct mlxsw_core_port *mlxsw_core_port);
 int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port);
 void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port);
-void mlxsw_core_port_set(struct mlxsw_core *mlxsw_core, u8 local_port,
-                        void *port_driver_priv, struct net_device *dev,
-                        bool split, u32 split_group);
+void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,
+                            void *port_driver_priv, struct net_device *dev,
+                            bool split, u32 split_group);
 void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port,
                           void *port_driver_priv);
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index ad4ff278cceeef11a7da5db0085ac68a65a2d720..8bca020e3fae1c200d615ad318417880be9a8d93 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -2358,8 +2358,9 @@ static int __mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,
                goto err_register_netdev;
        }
 
-       mlxsw_core_port_set(mlxsw_sp->core, mlxsw_sp_port->local_port,
-                           mlxsw_sp_port, dev, mlxsw_sp_port->split, module);
+       mlxsw_core_port_eth_set(mlxsw_sp->core, mlxsw_sp_port->local_port,
+                               mlxsw_sp_port, dev, mlxsw_sp_port->split,
+                               module);
        mlxsw_core_schedule_dw(&mlxsw_sp_port->hw_stats.update_dw, 0);
        return 0;
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index a905589263d97de400ebb1680b8798484c19a0ad..d110e3f8bbc5d85c44ec1e4ce209840a1c4562bd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -1098,8 +1098,8 @@ static int __mlxsw_sx_port_create(struct mlxsw_sx *mlxsw_sx, u8 local_port,
                goto err_register_netdev;
        }
 
-       mlxsw_core_port_set(mlxsw_sx->core, mlxsw_sx_port->local_port,
-                           mlxsw_sx_port, dev, false, 0);
+       mlxsw_core_port_eth_set(mlxsw_sx->core, mlxsw_sx_port->local_port,
+                               mlxsw_sx_port, dev, false, 0);
        mlxsw_sx->ports[local_port] = mlxsw_sx_port;
        return 0;