[media] vsp1: use proper dma alloc/free functions
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2016 20:49:01 +0000 (13:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2016 20:49:01 +0000 (13:49 -0700)
I noticed this while merging the drm tree and checking for stragglers:
the vsp1 driver still used dma_[alloc|free]_writecombine() that got
renamed in commit f6e45661f9be ("dma, mm/pat: Rename
dma_*_writecombine() to dma_*_wc()")

I should have noticed back in the media merge (commit bace3db5da97), but
better late than never.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/media/platform/vsp1/vsp1_dl.c

index 7dc27ac..1a9a585 100644 (file)
@@ -278,7 +278,7 @@ struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1)
        dl->vsp1 = vsp1;
        dl->size = VSP1_DL_BODY_SIZE * ARRAY_SIZE(dl->lists.all);
 
-       dl->mem = dma_alloc_writecombine(vsp1->dev, dl->size, &dl->dma,
+       dl->mem = dma_alloc_wc(vsp1->dev, dl->size, &dl->dma,
                                         GFP_KERNEL);
        if (!dl->mem) {
                kfree(dl);
@@ -300,6 +300,6 @@ struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1)
 
 void vsp1_dl_destroy(struct vsp1_dl *dl)
 {
-       dma_free_writecombine(dl->vsp1->dev, dl->size, dl->mem, dl->dma);
+       dma_free_wc(dl->vsp1->dev, dl->size, dl->mem, dl->dma);
        kfree(dl);
 }