dma-contiguous: remove dev_set_cma_area

[linux-2.6-microblaze.git] / arch / arm / mach-davinci / devices-da8xx.c

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index feb206b..1207eab 100644 (file)
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -884,6 +884,7 @@ early_param("rproc_mem", early_rproc_mem);
 
 void __init da8xx_rproc_reserve_cma(void)
 {
+       struct cma *cma;
        int ret;
 
        if (!rproc_base || !rproc_size) {
@@ -897,13 +898,16 @@ void __init da8xx_rproc_reserve_cma(void)
        pr_info("%s: reserving 0x%lx @ 0x%lx...\n",
                __func__, rproc_size, (unsigned long)rproc_base);
 
-       ret = dma_declare_contiguous(&da8xx_dsp.dev, rproc_size, rproc_base, 0);
-       if (ret)
-               pr_err("%s: dma_declare_contiguous failed %d\n", __func__, ret);
-       else
-               rproc_mem_inited = true;
+       ret = dma_contiguous_reserve_area(rproc_size, rproc_base, 0, &cma,
+                       true);
+       if (ret) {
+               pr_err("%s: dma_contiguous_reserve_area failed %d\n",
+                       __func__, ret);
+               return;
+       }
+       da8xx_dsp.dev.cma_area = cma;
+       rproc_mem_inited = true;
 }
-
 #else
 
 void __init da8xx_rproc_reserve_cma(void)