Commit 770c4c11 authored by Linus Torvalds's avatar Linus Torvalds

[media] vsp1: use proper dma alloc/free functions

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 f6e45661 ("dma, mm/pat: Rename
dma_*_writecombine() to dma_*_wc()")

I should have noticed back in the media merge (commit bace3db5), but
better late than never.
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 266c73b7
...@@ -278,7 +278,7 @@ struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1) ...@@ -278,7 +278,7 @@ struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1)
dl->vsp1 = vsp1; dl->vsp1 = vsp1;
dl->size = VSP1_DL_BODY_SIZE * ARRAY_SIZE(dl->lists.all); 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); GFP_KERNEL);
if (!dl->mem) { if (!dl->mem) {
kfree(dl); kfree(dl);
...@@ -300,6 +300,6 @@ struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1) ...@@ -300,6 +300,6 @@ struct vsp1_dl *vsp1_dl_create(struct vsp1_device *vsp1)
void vsp1_dl_destroy(struct vsp1_dl *dl) 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); kfree(dl);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment