aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-26 18:49:11 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-09-21 16:02:24 -0400
commit4886c399da70d5f8a4016c2213850dce6cac88c5 (patch)
treec2acf6b80b546e715cf8e3c10683ba478d61d595 /arch
parentde71f988003a2e0b3d5b5a3519e9426053b5dda5 (diff)
DMA-API: ppc: vio.c: replace dma_set_mask()+dma_set_coherent_mask() with new helper
Replace the following sequence: dma_set_mask(dev, mask); dma_set_coherent_mask(dev, mask); with a call to the new helper dma_set_mask_and_coherent(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/vio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 78a350670de3..96b6c97be5a1 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1413,8 +1413,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
1413 1413
1414 /* needed to ensure proper operation of coherent allocations 1414 /* needed to ensure proper operation of coherent allocations
1415 * later, in case driver doesn't set it explicitly */ 1415 * later, in case driver doesn't set it explicitly */
1416 dma_set_mask(&viodev->dev, DMA_BIT_MASK(64)); 1416 dma_set_mask_and_coherent(&viodev->dev, DMA_BIT_MASK(64));
1417 dma_set_coherent_mask(&viodev->dev, DMA_BIT_MASK(64));
1418 } 1417 }
1419 1418
1420 /* register with generic device framework */ 1419 /* register with generic device framework */