[PATCH] DMA-API: ppc: vio: use dma_coerce_mask_and_coherent()

[Cédric Le Goater]

Commit 4886c399da70d5f8a4016c2213850dce6cac88c5 (DMA-API: ppc: vio.c: 
replace dma_set_mask()+dma_set_coherent_mask() with new helper) 
introduced the usage of the new helper routine dma_set_mask_and_coherent(). 
This breaks the initialization of the pseries vio devices which do not 
setup an initial dev->dma_mask for the device.

Signed-off-by: Cédric Le Goater <clg at fr.ibm.com>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Cc: Paul Mackerras <paulus at samba.org>
---

 arch/powerpc/kernel/vio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index e7d0c88f..76a6482 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1419,7 +1419,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_and_coherent(&viodev->dev, DMA_BIT_MASK(64));
+		dma_coerce_mask_and_coherent(&viodev->dev, DMA_BIT_MASK(64));
 	}
 
 	/* register with generic device framework */
-- 
1.7.10.4