iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: socionext: refactor netsec_alloc_dring()

Browse Source 
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>
This commit is contained in:
Ilias Apalodimas
2018-11-08 17:19:55 +02:00
committed by David S. Miller
parent 4acb20b462
commit 0d404a6128
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/socionext/netsec.c
View File

@@ -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) static int netsec_alloc_dring(struct netsec_priv *priv, enum ring_id id)
{ {
struct netsec_desc_ring *dring = &priv->desc_ring[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->vaddr = dma_zalloc_coherent(priv->dev, DESC_SZ * DESC_NUM,
&dring->desc_dma, GFP_KERNEL); &dring->desc_dma, GFP_KERNEL);
if (!dring->vaddr) { if (!dring->vaddr)
ret = -ENOMEM;
goto err; goto err;
}
dring->desc = kcalloc(DESC_NUM, sizeof(*dring->desc), GFP_KERNEL); dring->desc = kcalloc(DESC_NUM, sizeof(*dring->desc), GFP_KERNEL);
if (!dring->desc) { if (!dring->desc)
ret = -ENOMEM;
goto err; goto err;
}
return 0; return 0;
err: err:
netsec_free_dring(priv, id); netsec_free_dring(priv, id);
return ret; return -ENOMEM;
} }
static int netsec_setup_rx_dring(struct netsec_priv *priv) static int netsec_setup_rx_dring(struct netsec_priv *priv)