Skip to content

Commit

Permalink
[media] vsp1: use proper dma alloc/free functions
Browse files Browse the repository at this point in the history
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 f6e4566 ("dma, mm/pat: Rename
dma_*_writecombine() to dma_*_wc()")

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

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Linus Torvalds committed Mar 21, 2016
1 parent 266c73b commit 770c4c1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/platform/vsp1/vsp1_dl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}

0 comments on commit 770c4c1

Please sign in to comment.