summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/soc-component.h2
-rw-r--r--sound/soc/soc-component.c19
-rw-r--r--sound/soc/soc-pcm.c23
3 files changed, 22 insertions, 22 deletions
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 4cab257962a6..dd1ea5d71998 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -379,5 +379,7 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
379 void __user *buf, unsigned long bytes); 379 void __user *buf, unsigned long bytes);
380struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, 380struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
381 unsigned long offset); 381 unsigned long offset);
382int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
383 struct vm_area_struct *vma);
382 384
383#endif /* __SOC_COMPONENT_H */ 385#endif /* __SOC_COMPONENT_H */
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index d503bc9b0850..2aff1b087522 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -506,3 +506,22 @@ struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
506 506
507 return NULL; 507 return NULL;
508} 508}
509
510int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
511 struct vm_area_struct *vma)
512{
513 struct snd_soc_pcm_runtime *rtd = substream->private_data;
514 struct snd_soc_rtdcom_list *rtdcom;
515 struct snd_soc_component *component;
516
517 for_each_rtdcom(rtd, rtdcom) {
518 component = rtdcom->component;
519
520 /* FIXME. it returns 1st mmap now */
521 if (component->driver->ops &&
522 component->driver->ops->mmap)
523 return component->driver->ops->mmap(substream, vma);
524 }
525
526 return -EINVAL;
527}
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index fe34f2e5d75e..7bbee0d71942 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2818,27 +2818,6 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
2818 } 2818 }
2819} 2819}
2820 2820
2821static int soc_rtdcom_mmap(struct snd_pcm_substream *substream,
2822 struct vm_area_struct *vma)
2823{
2824 struct snd_soc_pcm_runtime *rtd = substream->private_data;
2825 struct snd_soc_rtdcom_list *rtdcom;
2826 struct snd_soc_component *component;
2827
2828 for_each_rtdcom(rtd, rtdcom) {
2829 component = rtdcom->component;
2830
2831 if (!component->driver->ops ||
2832 !component->driver->ops->mmap)
2833 continue;
2834
2835 /* FIXME. it returns 1st mmap now */
2836 return component->driver->ops->mmap(substream, vma);
2837 }
2838
2839 return -EINVAL;
2840}
2841
2842/* create a new pcm */ 2821/* create a new pcm */
2843int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 2822int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
2844{ 2823{
@@ -2968,7 +2947,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
2968 if (ops->page) 2947 if (ops->page)
2969 rtd->ops.page = snd_soc_pcm_component_page; 2948 rtd->ops.page = snd_soc_pcm_component_page;
2970 if (ops->mmap) 2949 if (ops->mmap)
2971 rtd->ops.mmap = soc_rtdcom_mmap; 2950 rtd->ops.mmap = snd_soc_pcm_component_mmap;
2972 } 2951 }
2973 2952
2974 if (playback) 2953 if (playback)