net/mlx5e: Pass mdev to mlx5e_devlink_port_register()

Instead of accessing priv->mdev, pass mdev pointer to
mlx5e_devlink_port_register() and access it directly.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
index 03ad3b61dfc78109ddf54d9f743a26b3f1d39008..68502c742311258a9924883a6b976b0d9dfdf412 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
@@ -38,7 +38,8 @@ mlx5e_devlink_get_port_parent_id(struct mlx5_core_dev *dev, struct netdev_phys_i
 }
 
 int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,
-                               struct mlx5e_priv *priv)
+                               struct mlx5e_priv *priv,
+                               struct mlx5_core_dev *mdev)
 {
        struct devlink *devlink = priv_to_devlink(mlx5e_dev);
        struct devlink_port_attrs attrs = {};
@@ -46,19 +47,19 @@ int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,
        struct devlink_port *dl_port;
        unsigned int dl_port_index;
 
-       if (mlx5_core_is_pf(priv->mdev)) {
+       if (mlx5_core_is_pf(mdev)) {
                attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
-               attrs.phys.port_number = mlx5_get_dev_index(priv->mdev);
-               if (MLX5_ESWITCH_MANAGER(priv->mdev)) {
-                       mlx5e_devlink_get_port_parent_id(priv->mdev, &ppid);
+               attrs.phys.port_number = mlx5_get_dev_index(mdev);
+               if (MLX5_ESWITCH_MANAGER(mdev)) {
+                       mlx5e_devlink_get_port_parent_id(mdev, &ppid);
                        memcpy(attrs.switch_id.id, ppid.id, ppid.id_len);
                        attrs.switch_id.id_len = ppid.id_len;
                }
-               dl_port_index = mlx5_esw_vport_to_devlink_port_index(priv->mdev,
+               dl_port_index = mlx5_esw_vport_to_devlink_port_index(mdev,
                                                                     MLX5_VPORT_UPLINK);
        } else {
                attrs.flavour = DEVLINK_PORT_FLAVOUR_VIRTUAL;
-               dl_port_index = mlx5_esw_vport_to_devlink_port_index(priv->mdev, 0);
+               dl_port_index = mlx5_esw_vport_to_devlink_port_index(mdev, 0);
        }
 
        dl_port = mlx5e_devlink_get_dl_port(priv);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h b/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h
index 19b1d8e9634ec990ef634de04b052f0bfe06189c..d1088c8de0d3ef8ee45074303bc7c37a69ebd266 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h
@@ -10,7 +10,8 @@
 struct mlx5e_dev *mlx5e_create_devlink(struct device *dev);
 void mlx5e_destroy_devlink(struct mlx5e_dev *mlx5e_dev);
 int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,
-                               struct mlx5e_priv *priv);
+                               struct mlx5e_priv *priv,
+                               struct mlx5_core_dev *mdev);
 void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv);
 
 static inline struct devlink_port *

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index ec81d935262f88b84fd78e40acd8d18d2673d741..9b5b266b22b0fd20cd152a0dbf6dd2a0750dbd5f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -5921,7 +5921,7 @@ static int mlx5e_probe(struct auxiliary_device *adev,
        priv->dfs_root = debugfs_create_dir("nic",
                                            mlx5_debugfs_get_dev_root(priv->mdev));
 
-       err = mlx5e_devlink_port_register(mlx5e_dev, priv);
+       err = mlx5e_devlink_port_register(mlx5e_dev, priv, mdev);
        if (err) {
                mlx5_core_err(mdev, "mlx5e_devlink_port_register failed, %d\n", err);
                goto err_destroy_netdev;