mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
d4c999bb89
backport from wireless-drivers-next, replacing some existing patches in our tree (marked with '=' are those which were already present): f483039cf51a rt2x00: use simple_read_from_buffer() =5c656c71b1bf rt2800: move usb specific txdone/txstatus routines to rt2800lib =0b0d556e0ebb rt2800mmio: use txdone/txstatus routines from lib =5022efb50f62 rt2x00: do not check for txstatus timeout every time on tasklet =adf26a356f13 rt2x00: use different txstatus timeouts when flushing =0240564430c0 rt2800: flush and txstatus rework for rt2800mmio 6eba8fd22352 rt2x00: rt2400pci: mark expected switch fall-through 10bb92217747 rt2x00: rt2500pci: mark expected switch fall-through 916e6bbcfcff rt2x00: rt2800lib: mark expected switch fall-throughs 641dd8068ecb rt2x00: rt61pci: mark expected switch fall-through 750afb08ca71 cross-tree: phase out dma_zalloc_coherent() =c2e28ef7711f rt2x00: reduce tx power to nominal level on RT6352 a4296994eb80 rt2x00: Work around a firmware bug with shared keys 2587791d5758 rt2x00: no need to check return value of debugfs_create functions pending on linux-wireless: rt2x00: remove unneeded check rt2x00: remove confusing AGC register rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 rt2800: comment and simplify AGC init for RT6352 rt2x00: do not print error when queue is full rt2800: partially restore old mmio txstatus behaviour rt2800: new flush implementation for SoC devices rt2800: move txstatus pending routine rt2800mmio: fetch tx status changes rt2800mmio: use timer and work for handling tx statuses timeouts rt2x00: remove last_nostatus_check rt2x00: remove not used entry field rt2x00mmio: remove legacy comment While at it also rename some existing patches now that there are separate folders with patches for each driver to make things a bit nicer to handle. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 750afb08ca71310fcf0c4e2cb1565c63b8235b60 Mon Sep 17 00:00:00 2001
|
|
From: Luis Chamberlain <mcgrof@kernel.org>
|
|
Date: Fri, 4 Jan 2019 09:23:09 +0100
|
|
Subject: [PATCH 11/28] cross-tree: phase out dma_zalloc_coherent()
|
|
|
|
We already need to zero out memory for dma_alloc_coherent(), as such
|
|
using dma_zalloc_coherent() is superflous. Phase it out.
|
|
|
|
This change was generated with the following Coccinelle SmPL patch:
|
|
|
|
@ replace_dma_zalloc_coherent @
|
|
expression dev, size, data, handle, flags;
|
|
@@
|
|
|
|
-dma_zalloc_coherent(dev, size, handle, flags)
|
|
+dma_alloc_coherent(dev, size, handle, flags)
|
|
|
|
Suggested-by: Christoph Hellwig <hch@lst.de>
|
|
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
|
|
[hch: re-ran the script on the latest tree]
|
|
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c
|
|
@@ -119,9 +119,9 @@ static int rt2x00mmio_alloc_queue_dma(st
|
|
/*
|
|
* Allocate DMA memory for descriptor and buffer.
|
|
*/
|
|
- addr = dma_zalloc_coherent(rt2x00dev->dev,
|
|
- queue->limit * queue->desc_size, &dma,
|
|
- GFP_KERNEL);
|
|
+ addr = dma_alloc_coherent(rt2x00dev->dev,
|
|
+ queue->limit * queue->desc_size, &dma,
|
|
+ GFP_KERNEL);
|
|
if (!addr)
|
|
return -ENOMEM;
|
|
|