Skip to content

Commit

Permalink
net/mlx5e: Do not use netdev_err() before the netdev is registered
Browse files Browse the repository at this point in the history
Since it is un-named at this time.

Signed-off-by: Achiad Shochat <achiad@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Achiad Shochat authored and David S. Miller committed Jul 30, 2015
1 parent 97de9f3 commit 1f2a300
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1893,36 +1893,31 @@ static void *mlx5e_create_netdev(struct mlx5_core_dev *mdev)

err = mlx5_alloc_map_uar(mdev, &priv->cq_uar);
if (err) {
netdev_err(netdev, "%s: mlx5_alloc_map_uar failed, %d\n",
__func__, err);
mlx5_core_err(mdev, "alloc_map uar failed, %d\n", err);
goto err_free_netdev;
}

err = mlx5_core_alloc_pd(mdev, &priv->pdn);
if (err) {
netdev_err(netdev, "%s: mlx5_core_alloc_pd failed, %d\n",
__func__, err);
mlx5_core_err(mdev, "alloc pd failed, %d\n", err);
goto err_unmap_free_uar;
}

err = mlx5_alloc_transport_domain(mdev, &priv->tdn);
if (err) {
netdev_err(netdev, "%s: mlx5_alloc_transport_domain failed, %d\n",
__func__, err);
mlx5_core_err(mdev, "alloc td failed, %d\n", err);
goto err_dealloc_pd;
}

err = mlx5e_create_mkey(priv, priv->pdn, &priv->mr);
if (err) {
netdev_err(netdev, "%s: mlx5e_create_mkey failed, %d\n",
__func__, err);
mlx5_core_err(mdev, "create mkey failed, %d\n", err);
goto err_dealloc_transport_domain;
}

err = register_netdev(netdev);
if (err) {
netdev_err(netdev, "%s: register_netdev failed, %d\n",
__func__, err);
mlx5_core_err(mdev, "register_netdev failed, %d\n", err);
goto err_destroy_mkey;
}

Expand Down

0 comments on commit 1f2a300

Please sign in to comment.