dma-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags

[linux-2.6-microblaze.git] / arch / arm / mach-imx / mach-mx31moboard.c

diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index bde9a9a..3cd0309 100644 (file)
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -475,7 +475,7 @@ static phys_addr_t mx3_camera_base __initdata;
 
 static int __init mx31moboard_init_cam(void)
 {
-       int dma, ret = -ENOMEM;
+       int dma, ret;
        struct platform_device *pdev;
 
        imx31_add_ipu_core();
@@ -484,11 +484,11 @@ static int __init mx31moboard_init_cam(void)
        if (IS_ERR(pdev))
                return PTR_ERR(pdev);
 
-       dma = dma_declare_coherent_memory(&pdev->dev,
-                                       mx3_camera_base, mx3_camera_base,
-                                       MX3_CAMERA_BUF_SIZE,
-                                       DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
-       if (!(dma & DMA_MEMORY_MAP))
+       ret = dma_declare_coherent_memory(&pdev->dev,
+                                         mx3_camera_base, mx3_camera_base,
+                                         MX3_CAMERA_BUF_SIZE,
+                                         DMA_MEMORY_EXCLUSIVE);
+       if (ret)
                goto err;
 
        ret = platform_device_add(pdev);