| From: Linus Torvalds <torvalds@linux-foundation.org> |
| Date: Fri, 19 Apr 2013 10:01:04 -0700 |
| Subject: vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper |
| |
| commit 0fe09a45c4848b5b5607b968d959fdc1821c161d upstream. |
| |
| This is my example conversion of a few existing mmap users. The pcm |
| mmap case is one of the more straightforward ones. |
| |
| Acked-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| sound/core/pcm_native.c | 12 ++---------- |
| 1 file changed, 2 insertions(+), 10 deletions(-) |
| |
| --- a/sound/core/pcm_native.c |
| +++ b/sound/core/pcm_native.c |
| @@ -3204,18 +3204,10 @@ EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mm |
| int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, |
| struct vm_area_struct *area) |
| { |
| - long size; |
| - unsigned long offset; |
| + struct snd_pcm_runtime *runtime = substream->runtime;; |
| |
| area->vm_page_prot = pgprot_noncached(area->vm_page_prot); |
| - area->vm_flags |= VM_IO; |
| - size = area->vm_end - area->vm_start; |
| - offset = area->vm_pgoff << PAGE_SHIFT; |
| - if (io_remap_pfn_range(area, area->vm_start, |
| - (substream->runtime->dma_addr + offset) >> PAGE_SHIFT, |
| - size, area->vm_page_prot)) |
| - return -EAGAIN; |
| - return 0; |
| + return vm_iomap_memory(area, runtime->dma_addr, runtime->dma_bytes); |
| } |
| |
| EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem); |