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

DMA-API: parport: parport_pc.c: use dma_coerce_mask_and_coherent()

Browse Source 
The code sequence:
	dev->coherent_dma_mask = DMA_BIT_MASK(24);
	dev->dma_mask = &dev->coherent_dma_mask;
bypasses the architectures check on the DMA mask.  It can be replaced
with dma_coerce_mask_and_coherent(), avoiding the direct initialization
of this mask.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2013-06-27 13:49:14 +01:00
parent 26741a69d1
commit 93b11b2584
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/parport/parport_pc.c
View File

@ -2004,6 +2004,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
struct resource *ECR_res = NULL; struct resource *ECR_res = NULL;
struct resource *EPP_res = NULL; struct resource *EPP_res = NULL;
struct platform_device *pdev = NULL; struct platform_device *pdev = NULL;
int ret;
if (!dev) { if (!dev) {
/* We need a physical device to attach to, but none was /* We need a physical device to attach to, but none was
@ -2014,8 +2015,11 @@ struct parport *parport_pc_probe_port(unsigned long int base,
return NULL; return NULL;
dev = &pdev->dev; dev = &pdev->dev;
dev->coherent_dma_mask = DMA_BIT_MASK(24); ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(24));
dev->dma_mask = &dev->coherent_dma_mask; if (ret) {
dev_err(dev, "Unable to set coherent dma mask: disabling DMA\n");
dma = PARPORT_DMA_NONE;
}
} }
ops = kmalloc(sizeof(struct parport_operations), GFP_KERNEL); ops = kmalloc(sizeof(struct parport_operations), GFP_KERNEL);