Commit 35f69867 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller
Browse files

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: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent acf34954

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c

+3 −7
Original line number Diff line number Diff line
@@ -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);

}



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);

}

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+2 −9
Original line number Diff line number Diff line
@@ -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,18 +4791,12 @@ 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);



	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_tls_cleanup(priv);

	mlx5e_ipsec_cleanup(priv);