mac80211: rt2x00: backport accepted and pending patches from upstream
[openwrt/staging/pepe2k.git] / package / kernel / mac80211 / patches / rt2x00 / 011-cross-tree-phase-out-dma_zalloc_coherent.patch
1 From 750afb08ca71310fcf0c4e2cb1565c63b8235b60 Mon Sep 17 00:00:00 2001
2 From: Luis Chamberlain <mcgrof@kernel.org>
3 Date: Fri, 4 Jan 2019 09:23:09 +0100
4 Subject: [PATCH 11/28] cross-tree: phase out dma_zalloc_coherent()
5
6 We already need to zero out memory for dma_alloc_coherent(), as such
7 using dma_zalloc_coherent() is superflous. Phase it out.
8
9 This change was generated with the following Coccinelle SmPL patch:
10
11 @ replace_dma_zalloc_coherent @
12 expression dev, size, data, handle, flags;
13 @@
14
15 -dma_zalloc_coherent(dev, size, handle, flags)
16 +dma_alloc_coherent(dev, size, handle, flags)
17
18 Suggested-by: Christoph Hellwig <hch@lst.de>
19 Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
20 [hch: re-ran the script on the latest tree]
21 Signed-off-by: Christoph Hellwig <hch@lst.de>
22 ---
23 drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c | 6 +++---
24 1 file changed, 3 insertions(+), 3 deletions(-)
25
26 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c
27 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c
28 @@ -119,9 +119,9 @@ static int rt2x00mmio_alloc_queue_dma(st
29 /*
30 * Allocate DMA memory for descriptor and buffer.
31 */
32 - addr = dma_zalloc_coherent(rt2x00dev->dev,
33 - queue->limit * queue->desc_size, &dma,
34 - GFP_KERNEL);
35 + addr = dma_alloc_coherent(rt2x00dev->dev,
36 + queue->limit * queue->desc_size, &dma,
37 + GFP_KERNEL);
38 if (!addr)
39 return -ENOMEM;
40