net/mlx4_en: remove fallback after kzalloc_node()

kzalloc_node(..., GFP_KERNEL, node) will attempt to allocate
memory as close as possible to the node.

There is no need to fallback to kzalloc() if this has failed.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
index 062a88fcc5d6a82097da7c27484513a01ebe0d88..74d466796b7c726a11e8f885a59dba20df479c2b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
@@ -54,11 +54,8 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
 
        cq = kzalloc_node(sizeof(*cq), GFP_KERNEL, node);
        if (!cq) {
-               cq = kzalloc(sizeof(*cq), GFP_KERNEL);
-               if (!cq) {
-                       en_err(priv, "Failed to allocate CQ structure\n");
-                       return -ENOMEM;
-               }
+               en_err(priv, "Failed to allocate CQ structure\n");
+               return -ENOMEM;
        }
 
        cq->size = entries;

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index fd09ba98c0a6785eb6722284dc98975f577dac53..9a0881cb7f51d54fb5dff8f9ed9884cd5f3b867f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -271,11 +271,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
 
        ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node);
        if (!ring) {
-               ring = kzalloc(sizeof(*ring), GFP_KERNEL);
-               if (!ring) {
-                       en_err(priv, "Failed to allocate RX ring structure\n");
-                       return -ENOMEM;
-               }
+               en_err(priv, "Failed to allocate RX ring structure\n");
+               return -ENOMEM;
        }
 
        ring->prod = 0;

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 6f5153afcab4dfc331c099da854c54f1b9500887..2cbd2bd7c67ceae405ff2fa8114925a3e984e17d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -57,11 +57,8 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
 
        ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node);
        if (!ring) {
-               ring = kzalloc(sizeof(*ring), GFP_KERNEL);
-               if (!ring) {
-                       en_err(priv, "Failed allocating TX ring\n");
-                       return -ENOMEM;
-               }
+               en_err(priv, "Failed allocating TX ring\n");
+               return -ENOMEM;
        }
 
        ring->size = size;