net/mlx5: Don't rely on always true registered field

Devlink is an integral part of mlx5 driver and all flows ensure that
devlink_*_register() will success. That makes the ->registered check
an obsolete.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
index bc33eaa..86e0793 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
@@ -55,19 +55,15 @@ void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv)
 {
        struct devlink_port *dl_port = mlx5e_devlink_get_dl_port(priv);
 
-       if (dl_port->registered)
-               devlink_port_unregister(dl_port);
+       devlink_port_unregister(dl_port);
 }
 
 struct devlink_port *mlx5e_get_devlink_port(struct net_device *dev)
 {
        struct mlx5e_priv *priv = netdev_priv(dev);
-       struct devlink_port *port;
 
        if (!netif_device_present(dev))
                return NULL;
-       port = mlx5e_devlink_get_dl_port(priv);
-       if (port->registered)
-               return port;
-       return NULL;
+
+       return mlx5e_devlink_get_dl_port(priv);
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index b6c1e31..c663811 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -4776,7 +4776,6 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev,
                          struct net_device *netdev)
 {
        struct mlx5e_priv *priv = netdev_priv(netdev);
-       struct devlink_port *dl_port;
        int err;
 
        mlx5e_build_nic_params(priv, &priv->xsk, netdev->mtu);
@@ -4792,19 +4791,13 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev,
        if (err)
                mlx5_core_err(mdev, "TLS initialization failed, %d\n", err);
 
-       dl_port = mlx5e_devlink_get_dl_port(priv);
-       if (dl_port->registered)
-               mlx5e_health_create_reporters(priv);
-
+       mlx5e_health_create_reporters(priv);
        return 0;
 }
 
 static void mlx5e_nic_cleanup(struct mlx5e_priv *priv)
 {
-       struct devlink_port *dl_port = mlx5e_devlink_get_dl_port(priv);
-
-       if (dl_port->registered)
-               mlx5e_health_destroy_reporters(priv);
+       mlx5e_health_destroy_reporters(priv);
        mlx5e_tls_cleanup(priv);
        mlx5e_ipsec_cleanup(priv);
 }