Skip to content

Commit

Permalink
net: socionext: refactor netsec_alloc_dring()
Browse files Browse the repository at this point in the history
return -ENOMEM directly instead of assigning it in a variable

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ilias Apalodimas authored and David S. Miller committed Nov 9, 2018
1 parent 4acb20b commit 0d404a6
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/net/ethernet/socionext/netsec.c
Original file line number Diff line number Diff line change
Expand Up @@ -996,26 +996,21 @@ static void netsec_free_dring(struct netsec_priv *priv, int id)
static int netsec_alloc_dring(struct netsec_priv *priv, enum ring_id id)
{
struct netsec_desc_ring *dring = &priv->desc_ring[id];
int ret = 0;

dring->vaddr = dma_zalloc_coherent(priv->dev, DESC_SZ * DESC_NUM,
&dring->desc_dma, GFP_KERNEL);
if (!dring->vaddr) {
ret = -ENOMEM;
if (!dring->vaddr)
goto err;
}

dring->desc = kcalloc(DESC_NUM, sizeof(*dring->desc), GFP_KERNEL);
if (!dring->desc) {
ret = -ENOMEM;
if (!dring->desc)
goto err;
}

return 0;
err:
netsec_free_dring(priv, id);

return ret;
return -ENOMEM;
}

static int netsec_setup_rx_dring(struct netsec_priv *priv)
Expand Down

0 comments on commit 0d404a6

Please sign in to comment.