dma-mapping: use unsigned long for dma_attrs

[linux-2.6-block.git] / drivers / video / fbdev / omap2 / omapfb / omapfb-main.c

diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index 2fb90cb6803ffdceae66bf0ccea148848c5503f5..1d7c012f09dbb70cb0c5d1aed909272c94c4b4b3 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -1332,7 +1332,7 @@ static void omapfb_free_fbmem(struct fb_info *fbi)
        }
 
        dma_free_attrs(fbdev->dev, rg->size, rg->token, rg->dma_handle,
-                       &rg->attrs);
+                       rg->attrs);
 
        rg->token = NULL;
        rg->vaddr = NULL;
@@ -1370,7 +1370,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
        struct omapfb2_device *fbdev = ofbi->fbdev;
        struct omapfb2_mem_region *rg;
        void *token;
-       DEFINE_DMA_ATTRS(attrs);
+       unsigned long attrs;
        dma_addr_t dma_handle;
        int r;
 
@@ -1386,15 +1386,15 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
 
        size = PAGE_ALIGN(size);
 
-       dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
+       attrs = DMA_ATTR_WRITE_COMBINE;
 
        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
-               dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs);
+               attrs |= DMA_ATTR_NO_KERNEL_MAPPING;
 
        DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
 
        token = dma_alloc_attrs(fbdev->dev, size, &dma_handle,
-                       GFP_KERNEL, &attrs);
+                       GFP_KERNEL, attrs);
 
        if (token == NULL) {
                dev_err(fbdev->dev, "failed to allocate framebuffer\n");
@@ -1408,7 +1408,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
                r = omap_vrfb_request_ctx(&rg->vrfb);
                if (r) {
                        dma_free_attrs(fbdev->dev, size, token, dma_handle,
-                                       &attrs);
+                                       attrs);
                        dev_err(fbdev->dev, "vrfb create ctx failed\n");
                        return r;
                }