summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-27 00:49:11 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-09-21 22:02:24 +0200
commit4886c399da70d5f8a4016c2213850dce6cac88c5 (patch)
treec2acf6b80b546e715cf8e3c10683ba478d61d595 /arch
parentDMA-API: net: b43legacy: replace dma_set_mask()+dma_set_coherent_mask() with ... (diff)
downloadlinux-4886c399da70d5f8a4016c2213850dce6cac88c5.tar.xz
linux-4886c399da70d5f8a4016c2213850dce6cac88c5.zip
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)
/* needed to ensure proper operation of coherent allocations
* later, in case driver doesn't set it explicitly */
- dma_set_mask(&viodev->dev, DMA_BIT_MASK(64));
- dma_set_coherent_mask(&viodev->dev, DMA_BIT_MASK(64));
+ dma_set_mask_and_coherent(&viodev->dev, DMA_BIT_MASK(64));
}
/* register with generic device framework */