diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-06-04 21:07:59 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-04 17:27:59 -0400 |
| commit | 1f55c2865c21a49d882261cfa8d85635814ad8ab (patch) | |
| tree | cc43be9e6881d9c6f12288aba47df711b5436551 /drivers/net/wan/fsl_ucc_hdlc.c | |
| parent | 828da43224c089ab54be0c22c0fba30c77cd60c3 (diff) | |
| download | lwn-1f55c2865c21a49d882261cfa8d85635814ad8ab.tar.gz lwn-1f55c2865c21a49d882261cfa8d85635814ad8ab.zip | |
wan/fsl_ucc_hdlc: use dma_zalloc_coherent instead of allocator/memset
Use dma_zalloc_coherent instead of dma_alloc_coherent
followed by memset 0.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/fsl_ucc_hdlc.c')
| -rw-r--r-- | drivers/net/wan/fsl_ucc_hdlc.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index 33df76405b86..4205dfd19da3 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -270,10 +270,10 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) iowrite16be(DEFAULT_HDLC_ADDR, &priv->ucc_pram->haddr4); /* Get BD buffer */ - bd_buffer = dma_alloc_coherent(priv->dev, - (RX_BD_RING_LEN + TX_BD_RING_LEN) * - MAX_RX_BUF_LENGTH, - &bd_dma_addr, GFP_KERNEL); + bd_buffer = dma_zalloc_coherent(priv->dev, + (RX_BD_RING_LEN + TX_BD_RING_LEN) * + MAX_RX_BUF_LENGTH, + &bd_dma_addr, GFP_KERNEL); if (!bd_buffer) { dev_err(priv->dev, "Could not allocate buffer descriptors\n"); @@ -281,9 +281,6 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) goto free_tiptr; } - memset(bd_buffer, 0, (RX_BD_RING_LEN + TX_BD_RING_LEN) - * MAX_RX_BUF_LENGTH); - priv->rx_buffer = bd_buffer; priv->tx_buffer = bd_buffer + RX_BD_RING_LEN * MAX_RX_BUF_LENGTH; |