mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
serial/mpsc: switch to dma_alloc_attrs
Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e36361d70e
commit
7b45fff006
1 changed files with 6 additions and 4 deletions
|
@ -754,9 +754,10 @@ static int mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
|
|||
if (!dma_set_mask(pi->port.dev, 0xffffffff)) {
|
||||
printk(KERN_ERR "MPSC: Inadequate DMA support\n");
|
||||
rc = -ENXIO;
|
||||
} else if ((pi->dma_region = dma_alloc_noncoherent(pi->port.dev,
|
||||
} else if ((pi->dma_region = dma_alloc_attrs(pi->port.dev,
|
||||
MPSC_DMA_ALLOC_SIZE,
|
||||
&pi->dma_region_p, GFP_KERNEL))
|
||||
&pi->dma_region_p, GFP_KERNEL,
|
||||
DMA_ATTR_NON_CONSISTENT))
|
||||
== NULL) {
|
||||
printk(KERN_ERR "MPSC: Can't alloc Desc region\n");
|
||||
rc = -ENOMEM;
|
||||
|
@ -771,8 +772,9 @@ static void mpsc_free_ring_mem(struct mpsc_port_info *pi)
|
|||
pr_debug("mpsc_free_ring_mem[%d]: Freeing ring mem\n", pi->port.line);
|
||||
|
||||
if (pi->dma_region) {
|
||||
dma_free_noncoherent(pi->port.dev, MPSC_DMA_ALLOC_SIZE,
|
||||
pi->dma_region, pi->dma_region_p);
|
||||
dma_free_attrs(pi->port.dev, MPSC_DMA_ALLOC_SIZE,
|
||||
pi->dma_region, pi->dma_region_p,
|
||||
DMA_ATTR_NON_CONSISTENT);
|
||||
pi->dma_region = NULL;
|
||||
pi->dma_region_p = (dma_addr_t)NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue